Skip to content

Commit 80fcdae

Browse files
committed
Handle conflicting CLI and verbose=# better
1 parent b0cdd43 commit 80fcdae

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pycodestyle.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2257,7 +2257,7 @@ def read_config(options, args, arglist, parser):
22572257

22582258

22592259
def process_options(arglist=None, parse_argv=False, config_file=None,
2260-
parser=None, verbose=0):
2260+
parser=None, verbose=None):
22612261
"""Process options passed either via arglist or via command line args.
22622262
22632263
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,
22812281
(options, args) = parser.parse_args(arglist)
22822282
options.reporter = None
22832283

2284-
if verbose: # If specified verbose, continue on verbosity
2284+
# If explicity specified verbosity, override any `-v` CLI flag
2285+
if verbose is not None:
22852286
options.verbose = verbose
22862287

22872288
if options.ensure_value('testsuite', False):

0 commit comments

Comments
 (0)