diff -r fb0ef164f536 -r 698ae46f40a4 eric6/Plugins/CheckerPlugins/CodeStyleChecker/translations.py
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Sat May 01 14:27:20 2021 +0200
@@ -8,6 +8,7 @@
"""
import re
+import contextlib
from PyQt5.QtCore import QCoreApplication
@@ -28,6 +29,9 @@
from .Security.translations import (
_securityMessages, _securityMessagesSampleArgs
)
+from .Simplify.translations import (
+ _simplifyMessages, _simplifyMessagesSampleArgs
+)
##################################################################
## pycodestyle error messages
@@ -476,7 +480,6 @@
"E307": [3, 1],
"E308": [3],
"E501": [85, 79],
- "E605": ["A"],
"E711": ["None", "'if cond is None:'"],
"E712": ["True", "'if cond is True:' or 'if cond:'"],
"E741": ["l"],
@@ -488,6 +491,7 @@
_pycodestyleWarningMessagesSampleArgs = {
"W505": [80, 72],
+ "W605": ["A"],
}
_fixMessagesSampleArgs = {
@@ -504,6 +508,7 @@
"P": _pathlibMessages,
"S": _securityMessages,
"W": _pycodestyleWarningMessages,
+ "Y": _simplifyMessages,
"FIX": _fixMessages,
}
@@ -516,6 +521,7 @@
"M": _miscellaneousMessagesSampleArgs,
"S": _securityMessagesSampleArgs,
"W": _pycodestyleWarningMessagesSampleArgs,
+ "Y": _simplifyMessagesSampleArgs,
"FIX": _fixMessagesSampleArgs,
}
@@ -556,9 +562,9 @@
else:
args = messageArgs
- try:
+ with contextlib.suppress(KeyError):
catalog = messageCatalogs[messageCategory]
- try:
+ with contextlib.suppress(KeyError):
message = catalog[messageCode]
if args is None:
return message
@@ -567,10 +573,6 @@
return message(args)
else:
return message.format(*args)
- except KeyError:
- pass
- except KeyError:
- pass
if example:
return None
