Skip to content

Commit 807f839

Browse files
authored
bpo-45235: Revert an argparse bugfix that caused a regression (GH-29525)
* Revert "bpo-45235: Fix argparse overrides namespace with subparser defaults (GH-28420) (GH-28443)" This reverts commit a18d522.
1 parent 27b69e6 commit 807f839

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

Lib/argparse.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,8 +1210,7 @@ def __call__(self, parser, namespace, values, option_string=None):
12101210
# namespace for the relevant parts.
12111211
subnamespace, arg_strings = parser.parse_known_args(arg_strings, None)
12121212
for key, value in vars(subnamespace).items():
1213-
if not hasattr(namespace, key):
1214-
setattr(namespace, key, value)
1213+
setattr(namespace, key, value)
12151214

12161215
if arg_strings:
12171216
vars(namespace).setdefault(_UNRECOGNIZED_ARGS_ATTR, [])
@@ -1845,6 +1844,11 @@ def parse_known_args(self, args=None, namespace=None):
18451844
if action.default is not SUPPRESS:
18461845
setattr(namespace, action.dest, action.default)
18471846

1847+
# add any parser defaults that aren't present
1848+
for dest in self._defaults:
1849+
if not hasattr(namespace, dest):
1850+
setattr(namespace, dest, self._defaults[dest])
1851+
18481852
# parse the arguments and exit if there are any errors
18491853
if self.exit_on_error:
18501854
try:
@@ -1855,11 +1859,6 @@ def parse_known_args(self, args=None, namespace=None):
18551859
else:
18561860
namespace, args = self._parse_known_args(args, namespace)
18571861

1858-
# add any parser defaults that aren't present
1859-
for dest in self._defaults:
1860-
if not hasattr(namespace, dest):
1861-
setattr(namespace, dest, self._defaults[dest])
1862-
18631862
if hasattr(namespace, _UNRECOGNIZED_ARGS_ATTR):
18641863
args.extend(getattr(namespace, _UNRECOGNIZED_ARGS_ATTR))
18651864
delattr(namespace, _UNRECOGNIZED_ARGS_ATTR)

Lib/test/test_argparse.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,12 +3114,6 @@ def test_set_defaults_on_parent_and_subparser(self):
31143114
xparser.set_defaults(foo=2)
31153115
self.assertEqual(NS(foo=2), parser.parse_args(['X']))
31163116

3117-
def test_set_defaults_on_subparser_with_namespace(self):
3118-
parser = argparse.ArgumentParser()
3119-
xparser = parser.add_subparsers().add_parser('X')
3120-
xparser.set_defaults(foo=1)
3121-
self.assertEqual(NS(foo=2), parser.parse_args(['X'], NS(foo=2)))
3122-
31233117
def test_set_defaults_same_as_add_argument(self):
31243118
parser = ErrorRaisingArgumentParser()
31253119
parser.set_defaults(w='W', x='X', y='Y', z='Z')
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Reverted an argparse bugfix that caused regression in the handling of
2+
default arguments for subparsers. This prevented leaf level arguments from
3+
taking precedence over root level arguments.

0 commit comments

Comments
 (0)