summaryrefslogtreecommitdiffstats
path: root/Lib/argparse.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-09-18 06:47:41 (GMT)
committerGitHub <noreply@github.com>2021-09-18 06:47:41 (GMT)
commita18d52269ab6071a605d6c72f6af585a4c533ca4 (patch)
tree393c76cfccc6d274491be71a22068477e8cbd8c5 /Lib/argparse.py
parent6e151ff6fc39cc61e57c72a8c00633948c53eec7 (diff)
downloadcpython-a18d52269ab6071a605d6c72f6af585a4c533ca4.zip
cpython-a18d52269ab6071a605d6c72f6af585a4c533ca4.tar.gz
cpython-a18d52269ab6071a605d6c72f6af585a4c533ca4.tar.bz2
bpo-45235: Fix argparse overrides namespace with subparser defaults (GH-28420) (GH-28443)
Diffstat (limited to 'Lib/argparse.py')
-rw-r--r--Lib/argparse.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py
index f45a2ed..ecc9277 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1208,7 +1208,8 @@ class _SubParsersAction(Action):
# 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 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
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 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
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)