--- a/Plugins/CheckerPlugins/Pep8/pep8.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/CheckerPlugins/Pep8/pep8.py Fri Mar 11 16:51:57 2011 +0100 @@ -161,91 +161,91 @@ pep8_messages = { - "E101" : QT_TRANSLATE_NOOP("pep8", + "E101": QT_TRANSLATE_NOOP("pep8", "indentation contains mixed spaces and tabs"), - "E111" : QT_TRANSLATE_NOOP("pep8", + "E111": QT_TRANSLATE_NOOP("pep8", "indentation is not a multiple of four"), - "E112" : QT_TRANSLATE_NOOP("pep8", + "E112": QT_TRANSLATE_NOOP("pep8", "expected an indented block"), - "E113" : QT_TRANSLATE_NOOP("pep8", + "E113": QT_TRANSLATE_NOOP("pep8", "unexpected indentation"), - "W191" : QT_TRANSLATE_NOOP("pep8", + "W191": QT_TRANSLATE_NOOP("pep8", "indentation contains tabs"), - "E201" : QT_TRANSLATE_NOOP("pep8", + "E201": QT_TRANSLATE_NOOP("pep8", "whitespace after '{0}'"), - "E202" : QT_TRANSLATE_NOOP("pep8", + "E202": QT_TRANSLATE_NOOP("pep8", "whitespace before '{0}'"), - "E203" : QT_TRANSLATE_NOOP("pep8", + "E203": QT_TRANSLATE_NOOP("pep8", "whitespace before '{0}'"), - "E211" : QT_TRANSLATE_NOOP("pep8", + "E211": QT_TRANSLATE_NOOP("pep8", "whitespace before '{0}'"), - "E221" : QT_TRANSLATE_NOOP("pep8", + "E221": QT_TRANSLATE_NOOP("pep8", "multiple spaces before operator"), - "E222" : QT_TRANSLATE_NOOP("pep8", + "E222": QT_TRANSLATE_NOOP("pep8", "multiple spaces after operator"), - "E223" : QT_TRANSLATE_NOOP("pep8", + "E223": QT_TRANSLATE_NOOP("pep8", "tab before operator"), - "E224" : QT_TRANSLATE_NOOP("pep8", + "E224": QT_TRANSLATE_NOOP("pep8", "tab after operator"), - "E225" : QT_TRANSLATE_NOOP("pep8", + "E225": QT_TRANSLATE_NOOP("pep8", "missing whitespace around operator"), - "E231" : QT_TRANSLATE_NOOP("pep8", + "E231": QT_TRANSLATE_NOOP("pep8", "missing whitespace after '{0}'"), - "E241" : QT_TRANSLATE_NOOP("pep8", + "E241": QT_TRANSLATE_NOOP("pep8", "multiple spaces after '{0}'"), - "E242" : QT_TRANSLATE_NOOP("pep8", + "E242": QT_TRANSLATE_NOOP("pep8", "tab after '{0}'"), - "E251" : QT_TRANSLATE_NOOP("pep8", + "E251": QT_TRANSLATE_NOOP("pep8", "no spaces around keyword / parameter equals"), - "E261" : QT_TRANSLATE_NOOP("pep8", + "E261": QT_TRANSLATE_NOOP("pep8", "at least two spaces before inline comment"), - "E262" : QT_TRANSLATE_NOOP("pep8", + "E262": QT_TRANSLATE_NOOP("pep8", "inline comment should start with '# '"), - "W291" : QT_TRANSLATE_NOOP("pep8", + "W291": QT_TRANSLATE_NOOP("pep8", "trailing whitespace"), - "W292" : QT_TRANSLATE_NOOP("pep8", + "W292": QT_TRANSLATE_NOOP("pep8", "no newline at end of file"), - "W293" : QT_TRANSLATE_NOOP("pep8", + "W293": QT_TRANSLATE_NOOP("pep8", "blank line contains whitespace"), - "E301" : QT_TRANSLATE_NOOP("pep8", + "E301": QT_TRANSLATE_NOOP("pep8", "expected 1 blank line, found 0"), - "E302" : QT_TRANSLATE_NOOP("pep8", + "E302": QT_TRANSLATE_NOOP("pep8", "expected 2 blank lines, found {0}"), - "E303" : QT_TRANSLATE_NOOP("pep8", + "E303": QT_TRANSLATE_NOOP("pep8", "too many blank lines ({0})"), - "E304" : QT_TRANSLATE_NOOP("pep8", + "E304": QT_TRANSLATE_NOOP("pep8", "blank lines found after function decorator"), - "W391" : QT_TRANSLATE_NOOP("pep8", + "W391": QT_TRANSLATE_NOOP("pep8", "blank line at end of file"), - "E401" : QT_TRANSLATE_NOOP("pep8", + "E401": QT_TRANSLATE_NOOP("pep8", "multiple imports on one line"), - "E501" : QT_TRANSLATE_NOOP("pep8", + "E501": QT_TRANSLATE_NOOP("pep8", "line too long ({0} characters)"), - "W601" : QT_TRANSLATE_NOOP("pep8", + "W601": QT_TRANSLATE_NOOP("pep8", ".has_key() is deprecated, use 'in'"), - "W602" : QT_TRANSLATE_NOOP("pep8", + "W602": QT_TRANSLATE_NOOP("pep8", "deprecated form of raising exception"), - "W603" : QT_TRANSLATE_NOOP("pep8", + "W603": QT_TRANSLATE_NOOP("pep8", "'<>' is deprecated, use '!='"), - "W604" : QT_TRANSLATE_NOOP("pep8", + "W604": QT_TRANSLATE_NOOP("pep8", "backticks are deprecated, use 'repr()'"), - "E701" : QT_TRANSLATE_NOOP("pep8", + "E701": QT_TRANSLATE_NOOP("pep8", "multiple statements on one line (colon)"), - "E702" : QT_TRANSLATE_NOOP("pep8", + "E702": QT_TRANSLATE_NOOP("pep8", "multiple statements on one line (semicolon)"), } pep8_messages_sample_args = { - "E201" : ["([{"], - "E202" : ["}])"], - "E203" : [",;:"], - "E211" : ["(["], - "E231" : [",;:"], - "E241" : [",;:"], - "E242" : [",;:"], - "E302" : [1], - "E303" : [3], - "E501" : [85], + "E201": ["([{"], + "E202": ["}])"], + "E203": [",;:"], + "E211": ["(["], + "E231": [",;:"], + "E241": [",;:"], + "E242": [",;:"], + "E302": [1], + "E303": [3], + "E501": [85], } @@ -987,7 +987,7 @@ result = self.run_check(check, argument_names) if result is not None: offset, code, *args = result - self.report_error_args(self.line_number, offset, code, check, + self.report_error_args(self.line_number, offset, code, check, *args) def build_tokens_line(self):