mirror of
https://github.com/python/cpython.git
synced 2025-08-27 04:05:34 +00:00
Fix bug 9340 - argparse parse_known_args didn't work with subparsers
This commit is contained in:
parent
b68928bea7
commit
fca2e8aeb8
2 changed files with 34 additions and 2 deletions
|
@ -102,6 +102,7 @@ ZERO_OR_MORE = '*'
|
|||
ONE_OR_MORE = '+'
|
||||
PARSER = 'A...'
|
||||
REMAINDER = '...'
|
||||
_UNRECOGNIZED_ARGS_ATTR = '_unrecognized_args'
|
||||
|
||||
# =============================
|
||||
# Utility functions and classes
|
||||
|
@ -1083,7 +1084,12 @@ class _SubParsersAction(Action):
|
|||
raise ArgumentError(self, msg)
|
||||
|
||||
# parse all the remaining options into the namespace
|
||||
parser.parse_args(arg_strings, namespace)
|
||||
# store any unrecognized options on the object, so that the top
|
||||
# level parser can decide what to do with them
|
||||
namespace, arg_strings = parser.parse_known_args(arg_strings, namespace)
|
||||
if arg_strings:
|
||||
vars(namespace).setdefault(_UNRECOGNIZED_ARGS_ATTR, [])
|
||||
getattr(namespace, _UNRECOGNIZED_ARGS_ATTR).extend(arg_strings)
|
||||
|
||||
|
||||
# ==============
|
||||
|
@ -1699,7 +1705,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
|
|||
|
||||
# parse the arguments and exit if there are any errors
|
||||
try:
|
||||
return self._parse_known_args(args, namespace)
|
||||
namespace, args = self._parse_known_args(args, namespace)
|
||||
if hasattr(namespace, _UNRECOGNIZED_ARGS_ATTR):
|
||||
args.extend(getattr(namespace, _UNRECOGNIZED_ARGS_ATTR))
|
||||
delattr(namespace, _UNRECOGNIZED_ARGS_ATTR)
|
||||
return namespace, args
|
||||
except ArgumentError:
|
||||
err = _sys.exc_info()[1]
|
||||
self.error(str(err))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue