diff options
| author | Anthony Sottile <asottile@umich.edu> | 2019-07-23 04:29:28 +0000 |
|---|---|---|
| committer | Anthony Sottile <asottile@umich.edu> | 2019-07-23 04:29:28 +0000 |
| commit | 862b17d229454e31e312217237bfe65f90effbe8 (patch) | |
| tree | 90c816c502f95c364236bbe1dd77e4a6022e7873 | |
| parent | ace069c9c3585b4c74348f94da313bbc020dfc73 (diff) | |
| parent | 95f26d7fe9dd72a7aa4acc223758c38ede85031b (diff) | |
| download | flake8-862b17d229454e31e312217237bfe65f90effbe8.tar.gz | |
Merge branch 'extra-config-normalization' into 'master'
Push down extra config file path normalization into main config handling
See merge request pycqa/flake8!333
| -rw-r--r-- | src/flake8/main/application.py | 5 | ||||
| -rw-r--r-- | src/flake8/options/config.py | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/flake8/main/application.py b/src/flake8/main/application.py index f3c5382..4bbee28 100644 --- a/src/flake8/main/application.py +++ b/src/flake8/main/application.py @@ -158,13 +158,10 @@ class Application(object): def make_config_finder(self): """Make our ConfigFileFinder based on preliminary opts and args.""" if self.config_finder is None: - extra_config_files = utils.normalize_paths( - self.prelim_opts.append_config - ) self.config_finder = config.ConfigFileFinder( self.option_manager.program_name, self.prelim_args, - extra_config_files, + self.prelim_opts.append_config, ) def find_plugins(self): diff --git a/src/flake8/options/config.py b/src/flake8/options/config.py index 026618c..2af8cc8 100644 --- a/src/flake8/options/config.py +++ b/src/flake8/options/config.py @@ -28,11 +28,7 @@ class ConfigFileFinder(object): """ # The values of --append-config from the CLI extra_config_files = extra_config_files or [] - self.extra_config_files = [ - # Ensure the paths are absolute paths for local_config_files - os.path.abspath(f) - for f in extra_config_files - ] + self.extra_config_files = utils.normalize_paths(extra_config_files) # Platform specific settings self.is_windows = sys.platform == "win32" |