Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7c89ee3

Browse files
committedApr 15, 2021
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 4fe6f53 commit 7c89ee3

File tree

2 files changed

+47
-17
lines changed

2 files changed

+47
-17
lines changed
 

‎src/flake8/options/aggregator.py

+9-3
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,20 @@ def aggregate_options(
4949
# registered by plugins.
5050
extended_default_ignore = manager.extended_default_ignore.copy()
5151
# Let's store our extended default ignore for use by the decision engine
52-
default_values.extended_default_ignore = manager.extended_default_ignore.copy()
53-
LOG.debug("Extended default ignore list: %s", list(extended_default_ignore))
52+
default_values.extended_default_ignore = (
53+
manager.extended_default_ignore.copy()
54+
)
55+
LOG.debug(
56+
"Extended default ignore list: %s", list(extended_default_ignore)
57+
)
5458
extended_default_ignore.update(default_values.ignore)
5559
default_values.ignore = list(extended_default_ignore)
5660
LOG.debug("Merged default ignore list: %s", default_values.ignore)
5761

5862
extended_default_select = manager.extended_default_select.copy()
59-
LOG.debug("Extended default select list: %s", list(extended_default_select))
63+
LOG.debug(
64+
"Extended default select list: %s", list(extended_default_select)
65+
)
6066
default_values.extended_default_select = extended_default_select
6167

6268
# Merge values parsed from config onto the default values returned

‎src/flake8/style_guide.py

+38-14
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ def is_inline_ignored(self, disable_noqa: bool) -> bool:
105105
)
106106
return True
107107

108-
LOG.debug("%r is not ignored inline with ``# noqa: %s``", self, codes_str)
108+
LOG.debug(
109+
"%r is not ignored inline with ``# noqa: %s``", self, codes_str
110+
)
109111
return False
110112

111113
def is_in(self, diff: Dict[str, Set[int]]) -> bool:
@@ -175,16 +177,18 @@ def __init__(self, options: argparse.Namespace) -> None:
175177
reverse=True,
176178
)
177179
)
178-
self.using_default_ignore = set(self.ignored) == set(defaults.IGNORE).union(
179-
options.extended_default_ignore
180-
)
180+
self.using_default_ignore = set(self.ignored) == set(
181+
defaults.IGNORE
182+
).union(options.extended_default_ignore)
181183
self.using_default_select = set(self.selected) == set(defaults.SELECT)
182184

183185
def _in_all_selected(self, code: str) -> bool:
184186
return bool(self.all_selected) and code.startswith(self.all_selected)
185187

186188
def _in_extended_selected(self, code: str) -> bool:
187-
return bool(self.extended_selected) and code.startswith(self.extended_selected)
189+
return bool(self.extended_selected) and code.startswith(
190+
self.extended_selected
191+
)
188192

189193
def was_selected(self, code: str) -> Union[Selected, Ignored]:
190194
"""Determine if the code has been selected by the user.
@@ -264,7 +268,9 @@ def more_specific_decision_for(self, code: str) -> Decision:
264268
# default select list. In either case, we want the violation to be
265269
# selected.
266270
return Decision.Selected
267-
if select is None and (extra_select is None or not self.using_default_ignore):
271+
if select is None and (
272+
extra_select is None or not self.using_default_ignore
273+
):
268274
return Decision.Ignored
269275
if (select is None and not self.using_default_select) and (
270276
ignore is None and self.using_default_ignore
@@ -288,7 +294,9 @@ def make_decision(self, code: str) -> Decision:
288294
selected is Selected.Explicitly or selected is Selected.Implicitly
289295
) and ignored is Selected.Implicitly:
290296
decision = Decision.Selected
291-
elif (selected is Selected.Explicitly and ignored is Ignored.Explicitly) or (
297+
elif (
298+
selected is Selected.Explicitly and ignored is Ignored.Explicitly
299+
) or (
292300
selected is Ignored.Implicitly and ignored is Selected.Implicitly
293301
):
294302
decision = self.more_specific_decision_for(code)
@@ -360,7 +368,9 @@ def populate_style_guides_with(
360368
:rtype:
361369
:class:`~flake8.style_guide.StyleGuide`
362370
"""
363-
per_file = utils.parse_files_to_codes_mapping(options.per_file_ignores)
371+
per_file = utils.parse_files_to_codes_mapping(
372+
options.per_file_ignores
373+
)
364374
for filename, violations in per_file:
365375
yield self.default_style_guide.copy(
366376
filename=filename, extend_ignore_with=violations
@@ -378,7 +388,9 @@ def style_guide_for(self, filename: str) -> "StyleGuide":
378388
return guides[0]
379389

380390
@contextlib.contextmanager
381-
def processing_file(self, filename: str) -> Generator["StyleGuide", None, None]:
391+
def processing_file(
392+
self, filename: str
393+
) -> Generator["StyleGuide", None, None]:
382394
"""Record the fact that we're processing the file's results."""
383395
guide = self.style_guide_for(filename)
384396
with guide.processing_file(filename):
@@ -470,10 +482,14 @@ def copy(
470482
filename = filename or self.filename
471483
options = copy.deepcopy(self.options)
472484
options.ignore.extend(extend_ignore_with or [])
473-
return StyleGuide(options, self.formatter, self.stats, filename=filename)
485+
return StyleGuide(
486+
options, self.formatter, self.stats, filename=filename
487+
)
474488

475489
@contextlib.contextmanager
476-
def processing_file(self, filename: str) -> Generator["StyleGuide", None, None]:
490+
def processing_file(
491+
self, filename: str
492+
) -> Generator["StyleGuide", None, None]:
477493
"""Record the fact that we're processing the file's results."""
478494
self.formatter.beginning(filename)
479495
yield self
@@ -558,10 +574,16 @@ def handle_error(
558574
text,
559575
physical_line,
560576
)
561-
error_is_selected = self.should_report_error(error.code) is Decision.Selected
577+
error_is_selected = (
578+
self.should_report_error(error.code) is Decision.Selected
579+
)
562580
is_not_inline_ignored = error.is_inline_ignored(disable_noqa) is False
563581
is_included_in_diff = error.is_in(self._parsed_diff)
564-
if error_is_selected and is_not_inline_ignored and is_included_in_diff:
582+
if (
583+
error_is_selected
584+
and is_not_inline_ignored
585+
and is_included_in_diff
586+
):
565587
self.formatter.handle(error)
566588
self.stats.record(error)
567589
return 1
@@ -585,7 +607,9 @@ def find_more_specific(selected: str, ignored: str) -> Decision:
585607
return Decision.Ignored
586608

587609

588-
def find_first_match(error_code: str, code_list: Tuple[str, ...]) -> Optional[str]:
610+
def find_first_match(
611+
error_code: str, code_list: Tuple[str, ...]
612+
) -> Optional[str]:
589613
startswith = error_code.startswith
590614
for code in code_list:
591615
if startswith(code):

0 commit comments

Comments
 (0)
Please sign in to comment.