pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-03-29 18:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify conditoinal in decision logic

Browse source 
Add test to cover branch of decision logic we were not previously
exercising
This commit is contained in:
Ian Cordasco 2017-05-27 20:34:04 -05:00
parent 178092954d
commit aefa79535f
No known key found for this signature in database
GPG key ID: 656D3395E4A9791A
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/flake8/style_guide.py
View file

@ -146,8 +146,8 @@ class StyleGuide(object):
return find_more_specific(extra_select, ignore)
if select or (extra_select and self._using_default_select):
return Decision.Selected
if ((select is None and extra_select is None) or
(not self._using_default_ignore and select is None)):
if (select is None and
(extra_select is None or not self._using_default_ignore)):
return Decision.Ignored
return Decision.Selected

2
tests/unit/test_style_guide.py
View file

@ -169,6 +169,8 @@ def test_should_report_error(select_list, ignore_list, error_code, expected):
(['E2'], ['E21'], [], [], 'E212', style_guide.Decision.Ignored),
(['F', 'W'], ['C90'], ['I1'], [], 'C901',
style_guide.Decision.Ignored),
(['E', 'W'], ['C'], [], [], 'E131',
style_guide.Decision.Selected),
(defaults.SELECT, defaults.IGNORE, [], ['I'], 'I101',
style_guide.Decision.Selected),
(defaults.SELECT, defaults.IGNORE, ['G'], ['I'], 'G101',