Skip to content

Allow continuation of verbosity level #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sigmavirus24 merged 4 commits into from
Nov 18, 2017
Merged

Allow continuation of verbosity level #663

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c556daa
- Forward down verbosity level
mjsir911 Jul 9, 2017
b0cdd43
Transform booleans to numbers to go with previous code
mjsir911 Oct 22, 2017
80fcdae
Handle conflicting CLI and verbose=# better
mjsir911 Oct 22, 2017
d436d95
Default `verbose` to `None` instead of `0`
mjsir911 Oct 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pycodestyle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', None)
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:
Expand Down Expand Up @@ -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=None):
"""Process options passed either via arglist or via command line args.

Passing in the ``config_file`` parameter allows other tools, such as flake8
Expand All @@ -2280,6 +2281,10 @@ def process_options(arglist=None, parse_argv=False, config_file=None,
(options, args) = parser.parse_args(arglist)
options.reporter = None

# If explicity specified verbosity, override any `-v` CLI flag
if verbose is not None:
options.verbose = verbose

if options.ensure_value('testsuite', False):
args.append(options.testsuite)
elif not options.ensure_value('doctest', False):
Expand Down