diff options
| -rwxr-xr-x | pycodestyle.py | 6 | ||||
| -rw-r--r-- | testsuite/E72.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pycodestyle.py b/pycodestyle.py index 4227e62..038727a 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -129,8 +129,8 @@ COMPARE_SINGLETON_REGEX = re.compile(r'(\bNone|\bFalse|\bTrue)?\s*([=!]=)' COMPARE_NEGATIVE_REGEX = re.compile(r'\b(?<!is\s)(not)\s+[^][)(}{ ]+\s+' r'(in|is)\s') COMPARE_TYPE_REGEX = re.compile( - r'(?:[=!]=|is(?:\s+not)?)\s+type(?:\s*\(\s*([^)]*[^ )])\s*\))' + - r'|\btype(?:\s*\(\s*([^)]*[^ )])\s*\))\s+(?:[=!]=|is(?:\s+not)?)' + r'[=!]=\s+type(?:\s*\(\s*([^)]*[^ )])\s*\))' + r'|\btype(?:\s*\(\s*([^)]*[^ )])\s*\))\s+[=!]=' ) KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS)) OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+|:=)(\s*)') @@ -1441,7 +1441,7 @@ def comparison_type(logical_line, noqa): Do not compare types directly. Okay: if isinstance(obj, int): - E721: if type(obj) is type(1): + E721: if type(obj) == type(1): """ match = COMPARE_TYPE_REGEX.search(logical_line) if match and not noqa: diff --git a/testsuite/E72.py b/testsuite/E72.py index 61e17eb..ac55a95 100644 --- a/testsuite/E72.py +++ b/testsuite/E72.py @@ -9,7 +9,7 @@ import types if res == types.IntType: pass -#: E721 +#: Okay import types if type(res) is not types.ListType: @@ -26,9 +26,9 @@ assert type(res) == type((0,)) assert type(res) == type((0)) #: E721 assert type(res) != type((1, )) -#: E721 +#: Okay assert type(res) is type((1, )) -#: E721 +#: Okay assert type(res) is not type((1, )) #: E211 E721 assert type(res) == type ([2, ]) |