Merged revisions 86111 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86111 | steven.bethard | 2010-11-02 13:47:22 +0100 (Tue, 02 Nov 2010) | 1 line Fix bug 9340 - argparse parse_known_args didn't work with subparsers ........
This commit is contained in:
parent
a54bf8b006
commit
2e4d4c414e
|
@ -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)
|
||||
|
||||
|
||||
# ==============
|
||||
|
@ -1701,7 +1707,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))
|
||||
|
|
|
@ -1784,6 +1784,28 @@ class TestAddSubparsers(TestCase):
|
|||
NS(foo=True, bar=0.125, w=None, x='c'),
|
||||
)
|
||||
|
||||
def test_parse_known_args(self):
|
||||
self.assertEqual(
|
||||
self.parser.parse_known_args('0.5 1 b -w 7'.split()),
|
||||
(NS(foo=False, bar=0.5, w=7, x='b'), []),
|
||||
)
|
||||
self.assertEqual(
|
||||
self.parser.parse_known_args('0.5 -p 1 b -w 7'.split()),
|
||||
(NS(foo=False, bar=0.5, w=7, x='b'), ['-p']),
|
||||
)
|
||||
self.assertEqual(
|
||||
self.parser.parse_known_args('0.5 1 b -w 7 -p'.split()),
|
||||
(NS(foo=False, bar=0.5, w=7, x='b'), ['-p']),
|
||||
)
|
||||
self.assertEqual(
|
||||
self.parser.parse_known_args('0.5 1 b -q -rs -w 7'.split()),
|
||||
(NS(foo=False, bar=0.5, w=7, x='b'), ['-q', '-rs']),
|
||||
)
|
||||
self.assertEqual(
|
||||
self.parser.parse_known_args('0.5 -W 1 b -X Y -w 7 Z'.split()),
|
||||
(NS(foo=False, bar=0.5, w=7, x='b'), ['-W', '-X', 'Y', 'Z']),
|
||||
)
|
||||
|
||||
def test_dest(self):
|
||||
parser = ErrorRaisingArgumentParser()
|
||||
parser.add_argument('--foo', action='store_true')
|
||||
|
|
Loading…
Reference in New Issue