summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lee <IanLee1521@gmail.com>2015-02-07 16:43:55 -0800
committerIan Lee <IanLee1521@gmail.com>2015-02-07 16:43:55 -0800
commitd8786cfb5141d1f5cc6afbf26e15ccc773e8934b (patch)
treef15ec4964ab7544cb2f855fca9cc5c1c8740f682
parent6086f61c90c38b5ceb0bf1f473a382fb36f664b1 (diff)
parent69a3a3da9ed280831787bcecd6ee47caa2969571 (diff)
downloadpep8-d8786cfb5141d1f5cc6afbf26e15ccc773e8934b.tar.gz
Merge pull request #313 from hongqn/e721-noqa
allow use # noqa to disable E721 warning
-rw-r--r--docs/intro.rst2
-rwxr-xr-xpep8.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/intro.rst b/docs/intro.rst
index 13a9553..006187b 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -361,7 +361,7 @@ This is the current list of error and warning codes:
+----------+----------------------------------------------------------------------+
| E714 | test for object identity should be 'is not' |
+----------+----------------------------------------------------------------------+
-| E721 | do not compare types, use 'isinstance()' |
+| E721 (^) | do not compare types, use 'isinstance()' |
+----------+----------------------------------------------------------------------+
| E731 | do not assign a lambda expression, use a def |
+----------+----------------------------------------------------------------------+
diff --git a/pep8.py b/pep8.py
index e58662f..b0a99ce 100755
--- a/pep8.py
+++ b/pep8.py
@@ -1053,7 +1053,7 @@ def comparison_negative(logical_line):
yield pos, "E714 test for object identity should be 'is not'"
-def comparison_type(logical_line):
+def comparison_type(logical_line, noqa):
r"""Object type comparisons should always use isinstance().
Do not compare types directly.
@@ -1069,7 +1069,7 @@ def comparison_type(logical_line):
Okay: if type(a1) is type(b1):
"""
match = COMPARE_TYPE_REGEX.search(logical_line)
- if match:
+ if match and not noqa:
inst = match.group(1)
if inst and isidentifier(inst) and inst not in SINGLETONS:
return # Allow comparison for types which are not obvious