diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/flake8/api/legacy.py | 4 | ||||
| -rw-r--r-- | src/flake8/main/application.py | 19 | ||||
| -rw-r--r-- | src/flake8/processor.py | 5 |
3 files changed, 6 insertions, 22 deletions
diff --git a/src/flake8/api/legacy.py b/src/flake8/api/legacy.py index ac3fabb..2761163 100644 --- a/src/flake8/api/legacy.py +++ b/src/flake8/api/legacy.py @@ -10,6 +10,7 @@ import os.path import flake8 from flake8.formatting import base as formatter from flake8.main import application as app +from flake8.options import config LOG = logging.getLogger(__name__) @@ -30,9 +31,10 @@ def get_style_guide(**kwargs): application = app.Application() prelim_opts, remaining_args = application.parse_preliminary_options([]) flake8.configure_logging(prelim_opts.verbose, prelim_opts.output_file) - config_finder = application.make_config_finder( + config_finder = config.ConfigFileFinder( application.program, prelim_opts.append_config ) + application.find_plugins( config_finder, prelim_opts.config, prelim_opts.isolated ) diff --git a/src/flake8/main/application.py b/src/flake8/main/application.py index 19d7710..63db8e1 100644 --- a/src/flake8/main/application.py +++ b/src/flake8/main/application.py @@ -131,23 +131,6 @@ class Application(object): (self.result_count > 0) or self.catastrophic_failure ) - @staticmethod - def make_config_finder(program_name, extra_config_files): - # type: (str, List[str]) -> config.ConfigFileFinder - """Make our ConfigFileFinder based on preliminary options. - - :param str program_name: - Name of the current program (e.g., flake8). - :param list extra_config_files: - List of additional configuration files to be parsed for - configuration. - :returns: - The configuration file finder - :rtype: - config.ConfigFileFinder - """ - return config.ConfigFileFinder(program_name, extra_config_files) - def find_plugins(self, config_finder, config_file, ignore_config_files): # type: (config.ConfigFileFinder, Optional[str], bool) -> None """Find and load the plugins for this application. @@ -335,7 +318,7 @@ class Application(object): # our legacy API calls to these same methods. prelim_opts, remaining_args = self.parse_preliminary_options(argv) flake8.configure_logging(prelim_opts.verbose, prelim_opts.output_file) - config_finder = self.make_config_finder( + config_finder = config.ConfigFileFinder( self.program, prelim_opts.append_config ) self.find_plugins( diff --git a/src/flake8/processor.py b/src/flake8/processor.py index 0fd650b..498b9c7 100644 --- a/src/flake8/processor.py +++ b/src/flake8/processor.py @@ -346,9 +346,8 @@ class FileProcessor(object): :rtype: bool """ - if ( - not self.options.disable_noqa - and any(defaults.NOQA_FILE.match(line) for line in self.lines) + if not self.options.disable_noqa and any( + defaults.NOQA_FILE.match(line) for line in self.lines ): return True elif any(defaults.NOQA_FILE.search(line) for line in self.lines): |