pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-07 13:36:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #239

Browse source 
Two repairs:

* Make sure the selected and ignored sequences are non-empty before
  dereferencing index 0.
* Remove _enabled_extensions from the list of _ignored codes.  If an
  extension is enabled, it shouldn't be ignored.
This commit is contained in:
Barry Warsaw 2016-10-31 14:00:19 -04:00
parent 9553c8d8cc
commit 8a4b6e7ed2
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/flake8/style_guide.py
View file

@ -64,8 +64,9 @@ class StyleGuide(object):
self.stats = statistics.Statistics()
self._selected = tuple(options.select)
self._extended_selected = tuple(options.extended_default_select)
self._ignored = tuple(options.ignore)
self._enabled_extensions = tuple(options.enable_extensions)
self._ignored = tuple(
set(options.ignore) - set(self._enabled_extensions))
self._decision_cache = {}
self._parsed_diff = {}
@ -118,8 +119,14 @@ class StyleGuide(object):
def _decision_for(self, code):
# type: (Error) -> Decision
startswith = code.startswith
selected = sorted([s for s in self._selected if startswith(s)])[0]
ignored = sorted([i for i in self._ignored if startswith(i)])[0]
all_selected = sorted(s for s in self._selected if startswith(s))
if len(all_selected) == 0:
return Decision.Ignored
all_ignored = sorted(i for i in self._ignored if startswith(i))
if len(all_ignored) == 0:
return Decision.Ignored
selected = all_selected[0]
ignored = all_ignored[0]
if selected.startswith(ignored):
return Decision.Selected