diff options
author | Marco Sirabella <marco@sirabella.org> | 2017-10-22 10:02:02 -0400 |
---|---|---|
committer | Marco Sirabella <marco@sirabella.org> | 2017-10-22 10:02:02 -0400 |
commit | 80fcdae5d59167ad55478d7b076799249a79991d (patch) | |
tree | f80bb6229119befa639d65e13c56b368fcdf53df /pycodestyle.py | |
parent | b0cdd4343fbcabbb1e56fd3e5082096e0345343f (diff) | |
download | pep8-80fcdae5d59167ad55478d7b076799249a79991d.tar.gz |
Handle conflicting CLI and verbose=# better
Diffstat (limited to 'pycodestyle.py')
-rwxr-xr-x | pycodestyle.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pycodestyle.py b/pycodestyle.py index 3bc7976..5e9796c 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -2257,7 +2257,7 @@ def read_config(options, args, arglist, parser): def process_options(arglist=None, parse_argv=False, config_file=None, - parser=None, verbose=0): + parser=None, verbose=None): """Process options passed either via arglist or via command line args. Passing in the ``config_file`` parameter allows other tools, such as flake8 @@ -2281,7 +2281,8 @@ def process_options(arglist=None, parse_argv=False, config_file=None, (options, args) = parser.parse_args(arglist) options.reporter = None - if verbose: # If specified verbose, continue on verbosity + # If explicity specified verbosity, override any `-v` CLI flag + if verbose is not None: options.verbose = verbose if options.ensure_value('testsuite', False): |