summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-07-26 06:24:04 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2016-07-26 06:24:04 -0500
commitf82b5d62d0c4e48b95466bb259f3401aecf28de7 (patch)
treea3a2be431b16e5719b5bbdacb6adee78e1fd9721
parent88d9213962d6023d4ad97b54d2c6d1300512b727 (diff)
downloadflake8-f82b5d62d0c4e48b95466bb259f3401aecf28de7.tar.gz
Update NOQA regular expression
This allows for other text after `# noqa`. Related to #180
-rw-r--r--src/flake8/style_guide.py2
-rw-r--r--tests/unit/test_style_guide.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/flake8/style_guide.py b/src/flake8/style_guide.py
index 284444d..950d722 100644
--- a/src/flake8/style_guide.py
+++ b/src/flake8/style_guide.py
@@ -63,7 +63,7 @@ class StyleGuide(object):
# We do not care about the ``: `` that follows ``noqa``
# We do not care about the casing of ``noqa``
# We want a comma-separated list of errors
- '# noqa(?:: )?(?P<codes>[A-Z0-9,]+)?$',
+ '# noqa(?:: (?P<codes>[A-Z0-9,]+))?',
re.IGNORECASE
)
diff --git a/tests/unit/test_style_guide.py b/tests/unit/test_style_guide.py
index 3d05528..a38c657 100644
--- a/tests/unit/test_style_guide.py
+++ b/tests/unit/test_style_guide.py
@@ -127,6 +127,9 @@ def test_should_report_error(select_list, ignore_list, error_code, expected):
('E111', 'a = 1 # noqa: E111,W123,F821', True),
('W123', 'a = 1 # noqa: E111,W123,F821', True),
('E111', 'a = 1 # noqa: E11,W123,F821', True),
+ ('E111', 'a = 1 # noqa, analysis:ignore', True),
+ ('E111', 'a = 1 # noqa analysis:ignore', True),
+ ('E111', 'a = 1 # noqa - We do not care', True),
])
def test_is_inline_ignored(error_code, physical_line, expected_result):
"""Verify that we detect inline usage of ``# noqa``."""