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

Merge branch 'app-make-config-side-effect-free' into 'master'

Browse source 
application: Change `make_config_finder` to be a pure static method

See merge request pycqa/flake8!378
This commit is contained in:
Anthony Sottile 2019-11-06 04:35:22 +00:00
commit e653ab8062
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/flake8/api/legacy.py
View file

@ -30,7 +30,9 @@ def get_style_guide(**kwargs):
application = app.Application() application = app.Application()
prelim_opts, remaining_args = application.parse_preliminary_options([]) prelim_opts, remaining_args = application.parse_preliminary_options([])
flake8.configure_logging(prelim_opts.verbose, prelim_opts.output_file) flake8.configure_logging(prelim_opts.verbose, prelim_opts.output_file)
application.make_config_finder(prelim_opts.append_config) application.config_finder = application.make_config_finder(
application.program, prelim_opts.append_config
)
application.find_plugins(prelim_opts.config, prelim_opts.isolated) application.find_plugins(prelim_opts.config, prelim_opts.isolated)
application.register_plugin_options() application.register_plugin_options()
application.parse_configuration_and_cli(remaining_args) application.parse_configuration_and_cli(remaining_args)

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

@ -133,17 +133,22 @@ class Application(object):
(self.result_count > 0) or self.catastrophic_failure (self.result_count > 0) or self.catastrophic_failure
) )
def make_config_finder(self, extra_config_files): @staticmethod
# type: (List[str]) -> None def make_config_finder(program_name, extra_config_files):
# type: (str, List[str]) -> config.ConfigFileFinder
"""Make our ConfigFileFinder based on preliminary options. """Make our ConfigFileFinder based on preliminary options.
:param str program_name:
Name of the current programin (e.g., flake8).
:param list extra_config_files: :param list extra_config_files:
List of addtional configuration files to be parsed for List of addtional configuration files to be parsed for
configuration. configuration.
:returns:
The configuration file finder
:rtype:
config.ConfigFileFinder
""" """
self.config_finder = config.ConfigFileFinder( return config.ConfigFileFinder(program_name, extra_config_files)
self.program, extra_config_files
)
def find_plugins(self, config_file, ignore_config_files): def find_plugins(self, config_file, ignore_config_files):
# type: (Optional[str], bool) -> None # type: (Optional[str], bool) -> None
@ -333,7 +338,9 @@ class Application(object):
# our legacy API calls to these same methods. # our legacy API calls to these same methods.
prelim_opts, remaining_args = self.parse_preliminary_options(argv) prelim_opts, remaining_args = self.parse_preliminary_options(argv)
flake8.configure_logging(prelim_opts.verbose, prelim_opts.output_file) flake8.configure_logging(prelim_opts.verbose, prelim_opts.output_file)
self.make_config_finder(prelim_opts.append_config) self.config_finder = self.make_config_finder(
self.program, prelim_opts.append_config
)
self.find_plugins(prelim_opts.config, prelim_opts.isolated) self.find_plugins(prelim_opts.config, prelim_opts.isolated)
self.register_plugin_options() self.register_plugin_options()
self.parse_configuration_and_cli(remaining_args) self.parse_configuration_and_cli(remaining_args)

3
tests/unit/test_legacy_api.py
View file

@ -19,13 +19,14 @@ def test_get_style_guide():
) )
mockedapp = mock.Mock() mockedapp = mock.Mock()
mockedapp.parse_preliminary_options.return_value = (prelim_opts, []) mockedapp.parse_preliminary_options.return_value = (prelim_opts, [])
mockedapp.program = 'flake8'
with mock.patch('flake8.main.application.Application') as application: with mock.patch('flake8.main.application.Application') as application:
application.return_value = mockedapp application.return_value = mockedapp
style_guide = api.get_style_guide() style_guide = api.get_style_guide()
application.assert_called_once_with() application.assert_called_once_with()
mockedapp.parse_preliminary_options.assert_called_once_with([]) mockedapp.parse_preliminary_options.assert_called_once_with([])
mockedapp.make_config_finder.assert_called_once_with([]) mockedapp.make_config_finder.assert_called_once_with(mockedapp.program, [])
mockedapp.find_plugins.assert_called_once_with(None, False) mockedapp.find_plugins.assert_called_once_with(None, False)
mockedapp.register_plugin_options.assert_called_once_with() mockedapp.register_plugin_options.assert_called_once_with()
mockedapp.parse_configuration_and_cli.assert_called_once_with([]) mockedapp.parse_configuration_and_cli.assert_called_once_with([])