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

make --ignore order consistent

Browse source
This commit is contained in:
Anthony Sottile 2022-02-06 08:36:36 -08:00
parent ddae449cec
commit f7ef1a6c8b
4 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/flake8/options/aggregator.py
View file

@ -35,11 +35,9 @@ def aggregate_options(
default_values.extended_default_ignore = (
manager.extended_default_ignore.copy()
)
LOG.debug(
"Extended default ignore list: %s", list(extended_default_ignore)
)
extended_default_ignore.update(default_values.ignore)
default_values.ignore = list(extended_default_ignore)
LOG.debug("Extended default ignore list: %s", extended_default_ignore)
extended_default_ignore.extend(default_values.ignore)
default_values.ignore = extended_default_ignore
LOG.debug("Merged default ignore list: %s", default_values.ignore)
extended_default_select = manager.extended_default_select.copy()

9
src/flake8/options/manager.py
View file

@ -10,7 +10,6 @@ from typing import List
from typing import Mapping
from typing import Optional
from typing import Sequence
from typing import Set
from typing import Tuple
from typing import Type
from typing import Union
@ -353,8 +352,8 @@ class OptionManager:
self.config_options_dict: Dict[str, Option] = {}
self.options: List[Option] = []
self.extended_default_ignore: Set[str] = set()
self.extended_default_select: Set[str] = set()
self.extended_default_ignore: List[str] = []
self.extended_default_select: List[str] = []
self._current_group: Optional[argparse._ArgumentGroup] = None
@ -415,7 +414,7 @@ class OptionManager:
extend the default ignore list.
"""
LOG.debug("Extending default ignore list with %r", error_codes)
self.extended_default_ignore.update(error_codes)
self.extended_default_ignore.extend(error_codes)
def extend_default_select(self, error_codes: Sequence[str]) -> None:
"""Extend the default select list with the error codes provided.
@ -425,7 +424,7 @@ class OptionManager:
to extend the default select list.
"""
LOG.debug("Extending default select list with %r", error_codes)
self.extended_default_select.update(error_codes)
self.extended_default_select.extend(error_codes)
def parse_args(
self,