diff options
| author | Anthony Sottile <asottile@umich.edu> | 2019-07-08 21:57:21 +0000 |
|---|---|---|
| committer | Anthony Sottile <asottile@umich.edu> | 2019-07-08 21:57:21 +0000 |
| commit | 4a52c99cdee1f1882243564c18a228a2f9972be4 (patch) | |
| tree | c64768fcfe07da682e8b143e7bf9a7b8db6c9153 /src/flake8 | |
| parent | f00d483ea5940ab3cb5da2ea329054aa7e6e7447 (diff) | |
| parent | d4b0073167284c2ebb8c360afa376c4ff598f70c (diff) | |
| download | flake8-4a52c99cdee1f1882243564c18a228a2f9972be4.tar.gz | |
Merge branch 'fix_appveyor' into 'master'
Fix / improve recently merged patches + CI
See merge request pycqa/flake8!329
Diffstat (limited to 'src/flake8')
| -rw-r--r-- | src/flake8/checker.py | 2 | ||||
| -rw-r--r-- | src/flake8/main/options.py | 2 | ||||
| -rw-r--r-- | src/flake8/utils.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/flake8/checker.py b/src/flake8/checker.py index 405820c..6170d88 100644 --- a/src/flake8/checker.py +++ b/src/flake8/checker.py @@ -81,7 +81,7 @@ class Manager(object): "tokens": 0, } self.exclude = tuple( - itertools.chain(self.options.exclude, self.options.extend_exclude), + itertools.chain(self.options.exclude, self.options.extend_exclude) ) def _process_statistics(self): diff --git a/src/flake8/main/options.py b/src/flake8/main/options.py index e1f1767..bef5630 100644 --- a/src/flake8/main/options.py +++ b/src/flake8/main/options.py @@ -93,7 +93,7 @@ def register_default_options(option_manager): parse_from_config=True, comma_separated_list=True, help="Comma-separated list of files or directories to add to the list" - " of excluded ones." + " of excluded ones.", ) add_option( diff --git a/src/flake8/utils.py b/src/flake8/utils.py index a838140..02f0607 100644 --- a/src/flake8/utils.py +++ b/src/flake8/utils.py @@ -386,7 +386,7 @@ def filenames_from(arg, predicate=None): def fnmatch(filename, patterns): - # type: (str, List[str]) -> bool + # type: (str, Sequence[str]) -> bool """Wrap :func:`fnmatch.fnmatch` to add some functionality. :param str filename: @@ -453,7 +453,7 @@ def parameters_for(plugin): def matches_filename(path, patterns, log_message, logger): - # type: (str, List[str], str, logging.Logger) -> bool + # type: (str, Sequence[str], str, logging.Logger) -> bool """Use fnmatch to discern if a path exists in patterns. :param str path: |
