pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-09 22:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '405-ImportStarUsage' into 'master'

Browse source 
pyflakes ImportStarUsage => flake8 405 patch



See merge request !56
This commit is contained in:
Ian Cordasco 2016-06-15 11:32:04 +00:00
commit d425c246d0
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/warnings.rst
View file

@ -34,6 +34,8 @@ PyFlakes messages to add the following codes:
+------+--------------------------------------------------------------------+ +------+--------------------------------------------------------------------+
| F404 | future import(s) ``name`` after other statements | | F404 | future import(s) ``name`` after other statements |
+------+--------------------------------------------------------------------+ +------+--------------------------------------------------------------------+
| F405 | ``name`` may be undefined, or defined from star imports: ``module``|
+------+--------------------------------------------------------------------+
+------+--------------------------------------------------------------------+ +------+--------------------------------------------------------------------+
| F811 | redefinition of unused ``name`` from line ``N`` | | F811 | redefinition of unused ``name`` from line ``N`` |
+------+--------------------------------------------------------------------+ +------+--------------------------------------------------------------------+

1
flake8/_pyflakes.py
View file

@ -20,6 +20,7 @@ def patch_pyflakes():
'F402 ImportShadowedByLoopVar', 'F402 ImportShadowedByLoopVar',
'F403 ImportStarUsed', 'F403 ImportStarUsed',
'F404 LateFutureImport', 'F404 LateFutureImport',
'F405 ImportStarUsage',
'F810 Redefined', # XXX Obsolete? 'F810 Redefined', # XXX Obsolete?
'F811 RedefinedWhileUnused', 'F811 RedefinedWhileUnused',
'F812 RedefinedInListComp', 'F812 RedefinedInListComp',

9
flake8/tests/test_util.py
View file

@ -79,19 +79,19 @@ class TestOptionSerializerParsesLists(unittest.TestCase):
def setUp(self): def setUp(self):
self.option = optparse.Option('--select') self.option = optparse.Option('--select')
self.option_name = 'select' self.option_name = 'select'
self.answer = ['F401', 'F402', 'F403', 'F404'] self.answer = ['F401', 'F402', 'F403', 'F404', 'F405']
def test_parses_simple_comma_separated_lists(self): def test_parses_simple_comma_separated_lists(self):
value = option_normalizer('F401,F402,F403,F404', self.option, value = option_normalizer('F401,F402,F403,F404,F405', self.option,
self.option_name) self.option_name)
self.assertEqual(value, self.answer) self.assertEqual(value, self.answer)
def test_parses_less_simple_comma_separated_lists(self): def test_parses_less_simple_comma_separated_lists(self):
value = option_normalizer('F401 ,F402 ,F403 ,F404', self.option, value = option_normalizer('F401 ,F402 ,F403 ,F404, F405', self.option,
self.option_name) self.option_name)
self.assertEqual(value, self.answer) self.assertEqual(value, self.answer)
value = option_normalizer('F401, F402, F403, F404', self.option, value = option_normalizer('F401, F402, F403, F404, F405', self.option,
self.option_name) self.option_name)
self.assertEqual(value, self.answer) self.assertEqual(value, self.answer)
@ -101,6 +101,7 @@ class TestOptionSerializerParsesLists(unittest.TestCase):
F402, F402,
F403, F403,
F404, F404,
F405,
''', self.option, self.option_name) ''', self.option, self.option_name)
self.assertEqual(value, self.answer) self.assertEqual(value, self.answer)