diff options
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rwxr-xr-x | pep8.py | 60 | ||||
| -rw-r--r-- | testsuite/E24.py | 2 | ||||
| -rw-r--r-- | testsuite/E27.py | 16 |
4 files changed, 55 insertions, 29 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index af8970d..1471fd2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,12 @@ Changelog ========= +1.3 (UNRELEASED) +---------------- + +* Rewrite E27 checks to run faster. + + 1.2 (2012-06-01) ---------------- @@ -93,7 +93,7 @@ for space. """ -__version__ = '1.2' +__version__ = '1.3a0' import os import sys @@ -114,22 +114,24 @@ DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git' DEFAULT_IGNORE = 'E12,E24' MAX_LINE_LENGTH = 79 +SINGLETONS = frozenset(['False', 'None', 'True']) +KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS + INDENT_REGEX = re.compile(r'([ \t]*)') RAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*(,)') RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,\s*\w+\s*,\s*\w+') SELFTEST_REGEX = re.compile(r'(Okay|[EW]\d{3}):\s(.*)') ERRORCODE_REGEX = re.compile(r'[EW]\d{3}') DOCSTRING_REGEX = re.compile(r'u?r?["\']') -WHITESPACE_AROUND_OPERATOR_REGEX = \ - re.compile('([^\w\s]*)\s*(\t| )\s*([^\w\s]*)') -WHITESPACE_AROUND_KEYWORD_REGEX = \ - re.compile('([^\s]*)\s*(\t| )\s*([^\s]*)') EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]') WHITESPACE_AROUND_NAMED_PARAMETER_REGEX = \ re.compile(r'[()]|\s=[^=]|[^=!<>]=\s') COMPARE_SINGLETON_REGEX = re.compile(r'([=!]=)\s*(None|False|True)') COMPARE_TYPE_REGEX = re.compile(r'([=!]=|is|is\s+not)\s*type(?:s\.(\w+)Type' r'|\(\s*(\(\s*\)|[^)]*[^ )])\s*\))') +KEYWORD_REGEX = re.compile(r'(?:[^\s])(\s*)\b(?:%s)\b(\s*)' % + r'|'.join(KEYWORDS)) +OPERATOR_REGEX = re.compile(r'(?:[^\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)') LAMBDA_REGEX = re.compile(r'\blambda\b') @@ -142,8 +144,6 @@ UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) OPERATORS = BINARY_OPERATORS | UNARY_OPERATORS SKIP_TOKENS = frozenset([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE, tokenize.INDENT, tokenize.DEDENT]) -SINGLETONS = frozenset(['False', 'None', 'True']) -KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS BENCHMARK_KEYS = ('directories', 'files', 'logical lines', 'physical lines') options = None @@ -354,16 +354,18 @@ def whitespace_around_keywords(logical_line): E273: True and\tFalse E274: True\tand False """ - for match in WHITESPACE_AROUND_KEYWORD_REGEX.finditer(logical_line): - before, whitespace, after = match.groups() - tab = whitespace == '\t' - offset = match.start(2) - if before in KEYWORDS: - yield offset, (tab and "E273 tab after keyword" or - "E271 multiple spaces after keyword") - elif after in KEYWORDS: - yield offset, (tab and "E274 tab before keyword" or - "E272 multiple spaces before keyword") + for match in KEYWORD_REGEX.finditer(logical_line): + before, after = match.groups() + + if '\t' in before: + yield match.start(1), "E274 tab before keyword" + elif len(before) > 1: + yield match.start(1), "E272 multiple spaces before keyword" + + if '\t' in after: + yield match.start(2), "E273 tab after keyword" + elif len(after) > 1: + yield match.start(2), "E271 multiple spaces after keyword" def missing_whitespace(logical_line): @@ -646,16 +648,18 @@ def whitespace_around_operator(logical_line): E223: a = 4\t+ 5 E224: a = 4 +\t5 """ - for match in WHITESPACE_AROUND_OPERATOR_REGEX.finditer(logical_line): - before, whitespace, after = match.groups() - tab = whitespace == '\t' - offset = match.start(2) - if before in OPERATORS: - yield offset, (tab and "E224 tab after operator" or - "E222 multiple spaces after operator") - elif after in OPERATORS: - yield offset, (tab and "E223 tab before operator" or - "E221 multiple spaces before operator") + for match in OPERATOR_REGEX.finditer(logical_line): + before, after = match.groups() + + if '\t' in before: + yield match.start(1), "E223 tab before operator" + elif len(before) > 1: + yield match.start(1), "E221 multiple spaces before operator" + + if '\t' in after: + yield match.start(2), "E224 tab after operator" + elif len(after) > 1: + yield match.start(2), "E222 multiple spaces after operator" def missing_whitespace_around_operator(logical_line, tokens): @@ -931,7 +935,7 @@ def comparison_to_singleton(logical_line): msg = "'if cond %s %s:'" % (same and 'is' or 'is not', singleton) else: code = 'E712' - nonzero = ((same and singleton == 'True' and same) or + nonzero = ((singleton == 'True' and same) or (singleton == 'False' and not same)) msg = ("'if cond is %s:' or 'if%scond:'" % (nonzero and 'True' or 'False', nonzero and ' ' or ' not ')) diff --git a/testsuite/E24.py b/testsuite/E24.py index 92ca515..a93222c 100644 --- a/testsuite/E24.py +++ b/testsuite/E24.py @@ -1,6 +1,8 @@ #: E241 a = (1, 2) +#: Okay b = (1, 20) #: E242 a = (1, 2) # tab before 2 +#: Okay b = (1, 20) # space before 20 diff --git a/testsuite/E27.py b/testsuite/E27.py index c3c4bd1..72c62a8 100644 --- a/testsuite/E27.py +++ b/testsuite/E27.py @@ -6,9 +6,23 @@ True and False True and False #: E273 True and False -#: E274 +#: E273 E274 True and False +#: E271 +a and b +#: E271 +1 and b +#: E271 +a and 2 +#: E271 E272 +1 and b +#: E271 E272 +a and 2 #: E272 this and False +#: E273 +a and b #: E274 +a and b +#: E273 E274 this and False |