Skip to content

Commit

Permalink
Enable plugins automatically during registration
Browse files Browse the repository at this point in the history
Previously the --select was only ever populated to E,F,W,C and so
plugins would not be reported when not off-by-default. This adds a
tiny shim so that we enable plugins that are not off-by-default and
:x
:x
  • Loading branch information
sigmavirus24 committed Jun 28, 2016
1 parent 31c32e3 commit ec2e601
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 2 deletions.
7 changes: 7 additions & 0 deletions src/flake8/options/aggregator.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,14 @@ def aggregate_options(manager, arglist=None, values=None):
list(extended_default_ignore))
extended_default_ignore.update(default_values.ignore)
default_values.ignore = list(extended_default_ignore)

extended_default_select = manager.extended_default_select.copy()
LOG.debug('Extended default select list: %s',
list(extended_default_select))
extended_default_select.update(default_values.select)
default_values.select = list(extended_default_select)
LOG.debug('Merged default ignore list: %s', default_values.ignore)
LOG.debug('Merged default select list: %s', default_values.select)

# Merge values parsed from config onto the default values returned
for config_name, value in parsed_config.items():
Expand Down
15 changes: 13 additions & 2 deletions src/flake8/options/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ def __init__(self, prog=None, version=None,
self.version = version
self.registered_plugins = set()
self.extended_default_ignore = set()
self.extended_default_select = set()

@staticmethod
def format_plugin(plugin_tuple):
Expand Down Expand Up @@ -201,8 +202,8 @@ def remove_from_default_ignore(self, error_codes):
LOG.debug('Removing %r from the default ignore list', error_codes)
for error_code in error_codes:
try:
self.extend_default_ignore.remove(error_code)
except ValueError:
self.extended_default_ignore.remove(error_code)
except (ValueError, KeyError):
LOG.debug('Attempted to remove %s from default ignore'
' but it was not a member of the list.', error_code)

Expand All @@ -216,6 +217,16 @@ def extend_default_ignore(self, error_codes):
LOG.debug('Extending default ignore list with %r', error_codes)
self.extended_default_ignore.update(error_codes)

def extend_default_select(self, error_codes):
"""Extend the default select list with the error codes provided.
:param list error_codes:
List of strings that are the error/warning codes with which
to extend the default select list.
"""
LOG.debug('Extending default select list with %r', error_codes)
self.extended_default_select.update(error_codes)

def generate_versions(self, format_str='%(name)s: %(version)s'):
"""Generate a comma-separated list of versions of plugins."""
return ', '.join(
Expand Down
11 changes: 11 additions & 0 deletions src/flake8/plugins/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def load_plugin(self, verify_requirements=False):
def enable(self, optmanager):
"""Remove plugin name from the default ignore list."""
optmanager.remove_from_default_ignore([self.name])
optmanager.extend_default_select([self.name])

def disable(self, optmanager):
"""Add the plugin name to the default ignore list."""
Expand Down Expand Up @@ -418,6 +419,16 @@ def checks_expecting(self, argument_name):
if argument_name == plugin.parameters[0]:
yield plugin

def register_options(self, optmanager):
"""Register all of the checkers' options to the OptionManager."""
super(Checkers, self).register_options(optmanager)

def conditionally_enable(plugin):
if plugin.group() is None and not plugin.off_by_default:
plugin.enable(optmanager)

list(self.manager.map(conditionally_enable))

@property
def ast_plugins(self):
"""List of plugins that expect the AST tree."""
Expand Down

0 comments on commit ec2e601

Please sign in to comment.