diff options
author | Anthony Sottile <asottile@umich.edu> | 2022-07-30 15:01:02 -0400 |
---|---|---|
committer | Anthony Sottile <asottile@umich.edu> | 2022-07-30 15:01:02 -0400 |
commit | c14bd2aac8e370bc84048a97f17a1ed906523bf9 (patch) | |
tree | 626a7f2da008605cf902f8348ad7a12cfd47070f /pycodestyle.py | |
parent | d3566623bb451f6c7f1b65cc4f8538d2540da9e6 (diff) | |
download | pep8-c14bd2aac8e370bc84048a97f17a1ed906523bf9.tar.gz |
Revert "Merge pull request #1041 from asfaltboy/issue-830-e721-types-regex-incorrect"
This reverts commit 8b5c964321776b2fe8dfd25f4f18db0ffbdbd281, reversing
changes made to 9777ac5a8ea1ae14e70bfb27063e2e7c0daa06e3.
Diffstat (limited to 'pycodestyle.py')
-rwxr-xr-x | pycodestyle.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pycodestyle.py b/pycodestyle.py index f866dd4..ee0a58f 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -134,10 +134,8 @@ COMPARE_SINGLETON_REGEX = re.compile(r'(\bNone|\bFalse|\bTrue)?\s*([=!]=)' r'\s*(?(1)|(None|False|True))\b') 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)?)' -) +COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s+type(?:s.\w+Type' + r'|\s*\(\s*([^)]*[^ )])\s*\))') KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS)) OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+|:=)(\s*)') LAMBDA_REGEX = re.compile(r'\blambda\b') @@ -1446,6 +1444,13 @@ def comparison_type(logical_line, noqa): Okay: if isinstance(obj, int): E721: if type(obj) is type(1): + + When checking if an object is a string, keep in mind that it might + be a unicode string too! In Python 2.3, str and unicode have a + common base class, basestring, so you can do: + + Okay: if isinstance(obj, basestring): + Okay: if type(a1) is type(b1): """ match = COMPARE_TYPE_REGEX.search(logical_line) if match and not noqa: |