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

don't consider default codes as explicitly selected unless listed

Browse source
This commit is contained in:
Anthony Sottile 2022-06-24 17:55:41 -04:00
parent 9f608813b8
commit 367c810f0e
2 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/flake8/style_guide.py
View file

@ -47,6 +47,15 @@ class Decision(enum.Enum):
Selected = "selected error"
def _explicitly_chosen(
*,
option: Optional[List[str]],
extend: Optional[List[str]],
) -> Tuple[str, ...]:
ret = [*(option or []), *(extend or [])]
return tuple(sorted(ret, reverse=True))
def _select_ignore(
*,
option: Optional[List[str]],
@ -73,11 +82,13 @@ class DecisionEngine:
"""Initialize the engine."""
self.cache: Dict[str, Decision] = {}
self.using_default_select = (
options.select is None and options.extend_select is None
self.selected_explicitly = _explicitly_chosen(
option=options.select,
extend=options.extend_select,
)
self.using_default_ignore = (
options.ignore is None and options.extend_ignore is None
self.ignored_explicitly = _explicitly_chosen(
option=options.ignore,
extend=options.extend_ignore,
)
self.selected = _select_ignore(
@ -86,7 +97,6 @@ class DecisionEngine:
extended_default=options.extended_default_select,
extend=options.extend_select,
)
self.ignored = _select_ignore(
option=options.ignore,
default=defaults.IGNORE,
@ -105,11 +115,10 @@ class DecisionEngine:
Ignored.Implicitly if the selected list is not empty but no match
was found.
"""
if code.startswith(self.selected):
if self.using_default_select:
return Selected.Implicitly
else:
return Selected.Explicitly
if code.startswith(self.selected_explicitly):
return Selected.Explicitly
elif code.startswith(self.selected):
return Selected.Implicitly
else:
return Ignored.Implicitly
@ -125,11 +134,10 @@ class DecisionEngine:
Selected.Implicitly if the ignored list is not empty but no match
was found.
"""
if code.startswith(self.ignored):
if self.using_default_ignore:
return Ignored.Implicitly
else:
return Ignored.Explicitly
if code.startswith(self.ignored_explicitly):
return Ignored.Explicitly
elif code.startswith(self.ignored):
return Ignored.Implicitly
else:
return Selected.Implicitly