From fca2e8aeb8e841a18c4b9d2954254b2a086a3d56 Mon Sep 17 00:00:00 2001 From: Steven Bethard Date: Tue, 2 Nov 2010 12:47:22 +0000 Subject: Fix bug 9340 - argparse parse_known_args didn't work with subparsers --- Lib/argparse.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Lib/argparse.py') diff --git a/Lib/argparse.py b/Lib/argparse.py index 38dd8e6b9d..855ff5b93f 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -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)) -- cgit v1.2.1