From c556daab719a702859b648219006f9e0dee6faae Mon Sep 17 00:00:00 2001 From: Marco J Sirabella Date: Sun, 9 Jul 2017 18:58:37 -0400 Subject: [PATCH 1/4] - Forward down verbosity level --- pycodestyle.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pycodestyle.py b/pycodestyle.py index 5b7a39c1..f402bc2a 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -1995,8 +1995,9 @@ def __init__(self, *args, **kwargs): # build options from dict options_dict = dict(*args, **kwargs) arglist = None if parse_argv else options_dict.get('paths', None) + verbose = options_dict.get('verbose', False) options, self.paths = process_options( - arglist, parse_argv, config_file, parser) + arglist, parse_argv, config_file, parser, verbose) if options_dict: options.__dict__.update(options_dict) if 'paths' in options_dict: @@ -2256,7 +2257,7 @@ def read_config(options, args, arglist, parser): def process_options(arglist=None, parse_argv=False, config_file=None, - parser=None): + parser=None, verbose=False): """Process options passed either via arglist or via command line args. Passing in the ``config_file`` parameter allows other tools, such as flake8 @@ -2280,6 +2281,9 @@ 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 + options.verbose = verbose + if options.ensure_value('testsuite', False): args.append(options.testsuite) elif not options.ensure_value('doctest', False): From b0cdd4343fbcabbb1e56fd3e5082096e0345343f Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 22 Oct 2017 09:59:29 -0400 Subject: [PATCH 2/4] Transform booleans to numbers to go with previous code --- pycodestyle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pycodestyle.py b/pycodestyle.py index f402bc2a..3bc7976b 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -1995,7 +1995,7 @@ def __init__(self, *args, **kwargs): # build options from dict options_dict = dict(*args, **kwargs) arglist = None if parse_argv else options_dict.get('paths', None) - verbose = options_dict.get('verbose', False) + verbose = options_dict.get('verbose', 0) options, self.paths = process_options( arglist, parse_argv, config_file, parser, verbose) if options_dict: @@ -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=False): + parser=None, verbose=0): """Process options passed either via arglist or via command line args. Passing in the ``config_file`` parameter allows other tools, such as flake8 From 80fcdae5d59167ad55478d7b076799249a79991d Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 22 Oct 2017 10:02:02 -0400 Subject: [PATCH 3/4] Handle conflicting CLI and verbose=# better --- pycodestyle.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pycodestyle.py b/pycodestyle.py index 3bc7976b..5e9796c6 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): From d436d955549ebfc0755e5144230de9e85891c232 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Sun, 22 Oct 2017 11:26:46 -0400 Subject: [PATCH 4/4] Default `verbose` to `None` instead of `0` --- pycodestyle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycodestyle.py b/pycodestyle.py index 5e9796c6..bb04941a 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -1995,7 +1995,7 @@ def __init__(self, *args, **kwargs): # build options from dict options_dict = dict(*args, **kwargs) arglist = None if parse_argv else options_dict.get('paths', None) - verbose = options_dict.get('verbose', 0) + verbose = options_dict.get('verbose', None) options, self.paths = process_options( arglist, parse_argv, config_file, parser, verbose) if options_dict: