mirror of
https://github.com/PyCQA/flake8.git
synced 2026-04-04 12:16:53 +00:00
application: Ensure --version is unknown during preliminary parsing
Now that the preliminary parser is being used, we can remove needing to prune out `--version` and copying the original `argv` list.
This commit is contained in:
parent
b9c8c3e118
commit
4151ae0e53
2 changed files with 3 additions and 17 deletions
|
|
@ -116,21 +116,7 @@ class Application(object):
|
|||
:rtype:
|
||||
(argparse.Namespace, list)
|
||||
"""
|
||||
# We haven't found or registered our plugins yet, so let's defer
|
||||
# printing the version until we aggregate options from config files
|
||||
# and the command-line. First, let's clone our arguments on the CLI,
|
||||
# then we'll attempt to remove ``--version`` so that we can avoid
|
||||
# triggering the "version" action in argparse. If it's not there, we
|
||||
# do not need to worry and we can continue. If it is, we successfully
|
||||
# defer printing the version until just a little bit later.
|
||||
# Similarly we have to defer printing the help text until later.
|
||||
args = argv[:]
|
||||
try:
|
||||
args.remove("--version")
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
return self.prelim_arg_parser.parse_known_args(args)
|
||||
return self.prelim_arg_parser.parse_known_args(argv)
|
||||
|
||||
def exit(self):
|
||||
# type: () -> None
|
||||
|
|
|
|||
|
|
@ -93,10 +93,10 @@ def test_returns_specified_plugin(application):
|
|||
def test_prelim_opts_args(application):
|
||||
"""Verify we get sensible prelim opts and args."""
|
||||
opts, args = application.parse_preliminary_options_and_args(
|
||||
['--foo', '--verbose', 'src', 'setup.py', '--statistics'])
|
||||
['--foo', '--verbose', 'src', 'setup.py', '--statistics', '--version'])
|
||||
|
||||
assert opts.verbose
|
||||
assert args == ['--foo', 'src', 'setup.py', '--statistics']
|
||||
assert args == ['--foo', 'src', 'setup.py', '--statistics', '--version']
|
||||
|
||||
|
||||
def test_prelim_opts_ignore_help(application):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue