Merge pull request #442 from tonkoandrew/master

Fix regression in catching E711 (issue #435), add tests

Author: IanLee1521

pep8.py

@@ -108,7 +108,7 @@
 DOCSTRING_REGEX = re.compile(r'u?r?["\']')
 EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]')
 WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?:  |\t)')
-COMPARE_SINGLETON_REGEX = re.compile(r'\b(None|False|True)?\s*([=!]=)'
+COMPARE_SINGLETON_REGEX = re.compile(r'(\bNone|\bFalse|\bTrue)?\s*([=!]=)'
                                      r'\s*(?(1)|(None|False|True))\b')
 COMPARE_NEGATIVE_REGEX = re.compile(r'\b(not)\s+[^][)(}{ ]+\s+(in|is)\s')
 COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s*type(?:s.\w+Type'

testsuite/E71.py

@@ -10,6 +10,18 @@
 #: E711
 if None != res:
     pass
+#: E711
+if res[1] == None:
+    pass
+#: E711
+if res[1] != None:
+    pass
+#: E711
+if None != res[1]:
+    pass
+#: E711
+if None == res[1]:
+    pass
 
 #
 #: E712
@@ -24,6 +36,12 @@
 #: E712
 if False == res:
     pass
+#: E712
+if res[1] == True:
+    pass
+#: E712
+if res[1] != False:
+    pass
 
 #
 #: E713