summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Savchenko <asfaltboy@gmail.com>2021-12-12 09:16:36 +0000
committerPavel Savchenko <asfaltboy@gmail.com>2021-12-12 09:16:36 +0000
commitf3ee72b75a4df32221ab08d315e0614a59c17f26 (patch)
tree461f8f99e4ac51e7f0b1f07282bf223e64d60991
parent861c9a40fda1bf5094dc4229d0b00ec7e9ac8765 (diff)
downloadpep8-f3ee72b75a4df32221ab08d315e0614a59c17f26.tar.gz
Correct regex to only match type(...) comparisons
-rwxr-xr-xpycodestyle.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pycodestyle.py b/pycodestyle.py
index b839e35..c1ec98d 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -144,8 +144,10 @@ 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.\w+Type'
- r'|\s*\(\s*([^)]*[^ )])\s*\))')
+COMPARE_TYPE_REGEX = re.compile(
+ r'(?:[=!]=|is(?:\s+not)?)\s+type(?:\s*\(\s*([^)]*[^ )])\s*\))' +
+ r'|type(?:\s*\(\s*([^)]*[^ )])\s*\))\s+(?:[=!]=|is(?:\s+not)?)'
+)
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')