summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2019-02-11 14:25:26 +0000
committerAnthony Sottile <asottile@umich.edu>2019-02-11 14:25:26 +0000
commitdc7b082b96751c8ef7bfc616f8701d432afa7ef7 (patch)
tree8a5e788a7067d5a05007002db1a791ec94527c4c
parente7b8493b5d7af36f6c348566a7c3316b30e5b5ee (diff)
parent8e99b531cf9002228c4da31dd691a9d229c66362 (diff)
downloadflake8-dc7b082b96751c8ef7bfc616f8701d432afa7ef7.tar.gz
Merge branch 'allow_multiple_letters_in_codes' into 'master'
FIX 507: allow multiple letters in codes See merge request pycqa/flake8!303
-rw-r--r--src/flake8/utils.py2
-rw-r--r--tests/unit/test_utils.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/flake8/utils.py b/src/flake8/utils.py
index cb195ad..6048132 100644
--- a/src/flake8/utils.py
+++ b/src/flake8/utils.py
@@ -51,7 +51,7 @@ _Token = collections.namedtuple("Token", ("tp", "src"))
_CODE, _FILE, _COLON, _COMMA, _WS = "code", "file", "colon", "comma", "ws"
_EOF = "eof"
_FILE_LIST_TOKEN_TYPES = [
- (re.compile(r"[A-Z][0-9]*(?=$|\s|,)"), _CODE),
+ (re.compile(r"[A-Z]+[0-9]*(?=$|\s|,)"), _CODE),
(re.compile(r"[^\s:,]+"), _FILE),
(re.compile(r"\s*:\s*"), _COLON),
(re.compile(r"\s*,\s*"), _COMMA),
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 4b70918..dcbf8b8 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -90,6 +90,11 @@ def test_parse_comma_separated_list(value, expected):
['f.py:E,F', 'g.py:G,H'],
[('f.py', ['E', 'F']), ('g.py', ['G', 'H'])],
),
+ # six-digits codes are allowed
+ (
+ 'f.py: ABC123',
+ [('f.py', ['ABC123'])],
+ )
),
)
def test_parse_files_to_codes_mapping(value, expected):