mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
bpo-45235: Fix argparse overrides namespace with subparser defaults (GH-28420) (GH-28443)
This commit is contained in:
parent
6e151ff6fc
commit
a18d52269a
|
@ -1208,7 +1208,8 @@ def __call__(self, parser, namespace, values, option_string=None):
|
|||
# namespace for the relevant parts.
|
||||
subnamespace, arg_strings = parser.parse_known_args(arg_strings, None)
|
||||
for key, value in vars(subnamespace).items():
|
||||
setattr(namespace, key, value)
|
||||
if not hasattr(namespace, key):
|
||||
setattr(namespace, key, value)
|
||||
|
||||
if arg_strings:
|
||||
vars(namespace).setdefault(_UNRECOGNIZED_ARGS_ATTR, [])
|
||||
|
@ -1842,11 +1843,6 @@ def parse_known_args(self, args=None, namespace=None):
|
|||
if action.default is not SUPPRESS:
|
||||
setattr(namespace, action.dest, action.default)
|
||||
|
||||
# add any parser defaults that aren't present
|
||||
for dest in self._defaults:
|
||||
if not hasattr(namespace, dest):
|
||||
setattr(namespace, dest, self._defaults[dest])
|
||||
|
||||
# parse the arguments and exit if there are any errors
|
||||
if self.exit_on_error:
|
||||
try:
|
||||
|
@ -1857,6 +1853,11 @@ def parse_known_args(self, args=None, namespace=None):
|
|||
else:
|
||||
namespace, args = self._parse_known_args(args, namespace)
|
||||
|
||||
# add any parser defaults that aren't present
|
||||
for dest in self._defaults:
|
||||
if not hasattr(namespace, dest):
|
||||
setattr(namespace, dest, self._defaults[dest])
|
||||
|
||||
if hasattr(namespace, _UNRECOGNIZED_ARGS_ATTR):
|
||||
args.extend(getattr(namespace, _UNRECOGNIZED_ARGS_ATTR))
|
||||
delattr(namespace, _UNRECOGNIZED_ARGS_ATTR)
|
||||
|
|
|
@ -3057,6 +3057,12 @@ def test_set_defaults_on_parent_and_subparser(self):
|
|||
xparser.set_defaults(foo=2)
|
||||
self.assertEqual(NS(foo=2), parser.parse_args(['X']))
|
||||
|
||||
def test_set_defaults_on_subparser_with_namespace(self):
|
||||
parser = argparse.ArgumentParser()
|
||||
xparser = parser.add_subparsers().add_parser('X')
|
||||
xparser.set_defaults(foo=1)
|
||||
self.assertEqual(NS(foo=2), parser.parse_args(['X'], NS(foo=2)))
|
||||
|
||||
def test_set_defaults_same_as_add_argument(self):
|
||||
parser = ErrorRaisingArgumentParser()
|
||||
parser.set_defaults(w='W', x='X', y='Y', z='Z')
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix an issue where argparse would not preserve values in a provided namespace
|
||||
when using a subparser with defaults.
|
Loading…
Reference in a new issue