mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-19 07:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-45235: Revert an argparse bugfix that caused a regression (GH-29525)

Browse source 
* Revert "bpo-45235: Fix argparse overrides namespace with subparser defaults (GH-28420) (GH-28443)"

This reverts commit a18d52269a.
This commit is contained in:
Raymond Hettinger 2021-11-11 21:53:23 -06:00 • committed by GitHub
parent 27b69e60da
commit 807f839bbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/argparse.py
View file

@ -1210,7 +1210,6 @@ class _SubParsersAction(Action):
# namespace for the relevant parts. # namespace for the relevant parts.
subnamespace, arg_strings = parser.parse_known_args(arg_strings, None) subnamespace, arg_strings = parser.parse_known_args(arg_strings, None)
for key, value in vars(subnamespace).items(): for key, value in vars(subnamespace).items():
if not hasattr(namespace, key):
setattr(namespace, key, value) setattr(namespace, key, value)
if arg_strings: if arg_strings:
@ -1845,6 +1844,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
if action.default is not SUPPRESS: if action.default is not SUPPRESS:
setattr(namespace, action.dest, action.default) 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 # parse the arguments and exit if there are any errors
if self.exit_on_error: if self.exit_on_error:
try: try:
@ -1855,11 +1859,6 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
else: else:
namespace, args = self._parse_known_args(args, namespace) 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): if hasattr(namespace, _UNRECOGNIZED_ARGS_ATTR):
args.extend(getattr(namespace, _UNRECOGNIZED_ARGS_ATTR)) args.extend(getattr(namespace, _UNRECOGNIZED_ARGS_ATTR))
delattr(namespace, _UNRECOGNIZED_ARGS_ATTR) delattr(namespace, _UNRECOGNIZED_ARGS_ATTR)

6
Lib/test/test_argparse.py
View file

@ -3114,12 +3114,6 @@ class TestSetDefaults(TestCase):
xparser.set_defaults(foo=2) xparser.set_defaults(foo=2)
self.assertEqual(NS(foo=2), parser.parse_args(['X'])) 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): def test_set_defaults_same_as_add_argument(self):
parser = ErrorRaisingArgumentParser() parser = ErrorRaisingArgumentParser()
parser.set_defaults(w='W', x='X', y='Y', z='Z') parser.set_defaults(w='W', x='X', y='Y', z='Z')

3
Misc/NEWS.d/next/Library/2021-11-11-13-03-17.bpo-45235.8ZbkHa.rst Normal file
View file

@ -0,0 +1,3 @@
Reverted an argparse bugfix that caused regression in the handling of
default arguments for subparsers. This prevented leaf level arguments from
taking precedence over root level arguments.