diff options
| author | Anthony Sottile <asottile@umich.edu> | 2021-04-15 15:18:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 15:18:25 -0700 |
| commit | 36141509c5212736c4694aab9e0e1079993ee66d (patch) | |
| tree | 20a661ca6fc0621de73359e90a5c6506bd102144 /src/flake8 | |
| parent | 992bb77d2249b835a9bce6fd51e06b789cbd1eda (diff) | |
| parent | 2bb03083632f59184e71ea8e92a4b2ad6e14e89c (diff) | |
| download | flake8-36141509c5212736c4694aab9e0e1079993ee66d.tar.gz | |
Merge pull request #1317 from PyCQA/fix-extend-default-ignore
Fix bug for plugins using extend_default_ignore
Diffstat (limited to 'src/flake8')
| -rw-r--r-- | src/flake8/options/aggregator.py | 4 | ||||
| -rw-r--r-- | src/flake8/style_guide.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/flake8/options/aggregator.py b/src/flake8/options/aggregator.py index b53b674..40848a2 100644 --- a/src/flake8/options/aggregator.py +++ b/src/flake8/options/aggregator.py @@ -48,6 +48,10 @@ def aggregate_options( # Extend the default ignore value with the extended default ignore list, # registered by plugins. extended_default_ignore = manager.extended_default_ignore.copy() + # Let's store our extended default ignore for use by the decision engine + default_values.extended_default_ignore = ( + manager.extended_default_ignore.copy() + ) LOG.debug( "Extended default ignore list: %s", list(extended_default_ignore) ) diff --git a/src/flake8/style_guide.py b/src/flake8/style_guide.py index a34afd7..d862691 100644 --- a/src/flake8/style_guide.py +++ b/src/flake8/style_guide.py @@ -177,7 +177,9 @@ class DecisionEngine: reverse=True, ) ) - self.using_default_ignore = set(self.ignored) == set(defaults.IGNORE) + self.using_default_ignore = set(self.ignored) == set( + defaults.IGNORE + ).union(options.extended_default_ignore) self.using_default_select = set(self.selected) == set(defaults.SELECT) def _in_all_selected(self, code: str) -> bool: |