summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2017-01-30 09:48:41 -0600
committerIan Cordasco <graffatcolmingov@gmail.com>2017-01-30 09:48:41 -0600
commita574081fd55c15f509a8c0724d40c79ac74dd2f6 (patch)
tree031bbfde9608a6a52f5f23c3a5b3c49d6ab9fc80
parent9f725fb0fad8919a9467834309fbd9f604280035 (diff)
downloadpep8-a574081fd55c15f509a8c0724d40c79ac74dd2f6.tar.gz
Fix regression in E302 detection
This was similar to an issue we had with E306 in which we were only checking that a line started with "def" or "class" which catches global vars like "defaults" or "classification". Closes gh-617
-rwxr-xr-xpycodestyle.py2
-rw-r--r--testsuite/E30not.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/pycodestyle.py b/pycodestyle.py
index 2e4ebed..9f14444 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -122,7 +122,7 @@ OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)')
LAMBDA_REGEX = re.compile(r'\blambda\b')
HUNK_REGEX = re.compile(r'^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$')
STARTSWITH_DEF_REGEX = re.compile(r'^(async\s+def|def)')
-STARTSWITH_TOP_LEVEL_REGEX = re.compile(r'^(async\s+def|def|class|@)')
+STARTSWITH_TOP_LEVEL_REGEX = re.compile(r'^(async\s+def |def |class |@)')
STARTSWITH_INDENT_STATEMENT_REGEX = re.compile(
r'^\s*({0})'.format('|'.join(s.replace(' ', '\s+') for s in (
'def', 'async def',
diff --git a/testsuite/E30not.py b/testsuite/E30not.py
index 63ff733..00bee95 100644
--- a/testsuite/E30not.py
+++ b/testsuite/E30not.py
@@ -155,3 +155,6 @@ if __name__ == '__main__':
classification_errors = None
#: Okay
defined_properly = True
+#: Okay
+defaults = {}
+defaults.update({})