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

Merge branch 'app-remove-cached-objects' into 'master'

Browse source 
application: Remove checks for properties being set previously

See merge request pycqa/flake8!379
This commit is contained in:
Eric N. Vander Weele 2019-11-05 13:43:01 +00:00
commit c2f4efae8e
1 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/flake8/main/application.py
View file

@ -162,22 +162,19 @@ class Application(object):
Determine whether to parse configuration files or not. (i.e., the Determine whether to parse configuration files or not. (i.e., the
--isolated option). --isolated option).
""" """
if self.local_plugins is None: self.local_plugins = config.get_local_plugins(
self.local_plugins = config.get_local_plugins( self.config_finder, config_file, ignore_config_files
self.config_finder, config_file, ignore_config_files )
)
sys.path.extend(self.local_plugins.paths) sys.path.extend(self.local_plugins.paths)
if self.check_plugins is None: self.check_plugins = plugin_manager.Checkers(
self.check_plugins = plugin_manager.Checkers( self.local_plugins.extension
self.local_plugins.extension )
)
if self.formatting_plugins is None: self.formatting_plugins = plugin_manager.ReportFormatters(
self.formatting_plugins = plugin_manager.ReportFormatters( self.local_plugins.report
self.local_plugins.report )
)
self.check_plugins.load_plugins() self.check_plugins.load_plugins()
self.formatting_plugins.load_plugins() self.formatting_plugins.load_plugins()
@ -196,10 +193,9 @@ class Application(object):
:param list argv: :param list argv:
Command-line arguments passed in directly. Command-line arguments passed in directly.
""" """
if self.options is None and self.args is None: self.options, self.args = aggregator.aggregate_options(
self.options, self.args = aggregator.aggregate_options( self.option_manager, self.config_finder, argv
self.option_manager, self.config_finder, argv )
)
self.running_against_diff = self.options.diff self.running_against_diff = self.options.diff
if self.running_against_diff: if self.running_against_diff:
@ -232,25 +228,23 @@ class Application(object):
def make_formatter(self, formatter_class=None): def make_formatter(self, formatter_class=None):
# type: (Optional[Type[BaseFormatter]]) -> None # type: (Optional[Type[BaseFormatter]]) -> None
"""Initialize a formatter based on the parsed options.""" """Initialize a formatter based on the parsed options."""
if self.formatter is None: format_plugin = self.options.format
format_plugin = self.options.format if 1 <= self.options.quiet < 2:
if 1 <= self.options.quiet < 2: format_plugin = "quiet-filename"
format_plugin = "quiet-filename" elif 2 <= self.options.quiet:
elif 2 <= self.options.quiet: format_plugin = "quiet-nothing"
format_plugin = "quiet-nothing"
if formatter_class is None: if formatter_class is None:
formatter_class = self.formatter_for(format_plugin) formatter_class = self.formatter_for(format_plugin)
self.formatter = formatter_class(self.options) self.formatter = formatter_class(self.options)
def make_guide(self): def make_guide(self):
# type: () -> None # type: () -> None
"""Initialize our StyleGuide.""" """Initialize our StyleGuide."""
if self.guide is None: self.guide = style_guide.StyleGuideManager(
self.guide = style_guide.StyleGuideManager( self.options, self.formatter
self.options, self.formatter )
)
if self.running_against_diff: if self.running_against_diff:
self.guide.add_diff_ranges(self.parsed_diff) self.guide.add_diff_ranges(self.parsed_diff)
@ -258,12 +252,11 @@ class Application(object):
def make_file_checker_manager(self): def make_file_checker_manager(self):
# type: () -> None # type: () -> None
"""Initialize our FileChecker Manager.""" """Initialize our FileChecker Manager."""
if self.file_checker_manager is None: self.file_checker_manager = checker.Manager(
self.file_checker_manager = checker.Manager( style_guide=self.guide,
style_guide=self.guide, arguments=self.args,
arguments=self.args, checker_plugins=self.check_plugins,
checker_plugins=self.check_plugins, )
)
def run_checks(self, files=None): def run_checks(self, files=None):
# type: (Optional[List[str]]) -> None # type: (Optional[List[str]]) -> None