summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Smith <smichr@gmail.com>2012-10-21 16:43:26 +0545
committerChris Smith <smichr@gmail.com>2012-10-21 16:43:26 +0545
commit50b4955b6927785d9c6e8c8072ff7bfb7649c3ca (patch)
tree92b25bdc4eef34d3ef97d29bb7f54194fc8a1da3
parent7f2d5a3f561d48864211642097f05c6a5d2c2a55 (diff)
downloadpep8-50b4955b6927785d9c6e8c8072ff7bfb7649c3ca.tar.gz
E27 finds keyword at start of line
-rwxr-xr-xpep8.py2
-rw-r--r--testsuite/E27.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/pep8.py b/pep8.py
index d57cdf3..8b39c83 100755
--- a/pep8.py
+++ b/pep8.py
@@ -148,7 +148,7 @@ WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?: |\t)')
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*)' %
+KEYWORD_REGEX = re.compile(r'(?:[^\s]|\b)(\s*)\b(?:%s)\b(\s*)' %
r'|'.join(KEYWORDS))
OPERATOR_REGEX = re.compile(r'(?:[^\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)')
LAMBDA_REGEX = re.compile(r'\blambda\b')
diff --git a/testsuite/E27.py b/testsuite/E27.py
index 72c62a8..028ac49 100644
--- a/testsuite/E27.py
+++ b/testsuite/E27.py
@@ -4,6 +4,8 @@ True and False
True and False
#: E272
True and False
+#: E272
+if 1:
#: E273
True and False
#: E273 E274