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

[3.12] gh-121018: Fix more cases of exiting in argparse when exit_on_error=False (GH-121056) (GH-121129)

Browse source 
* parse_intermixed_args() now raises ArgumentError instead of calling
  error() if exit_on_error is false.
* Internal code now always raises ArgumentError instead of calling
  error(). It is then caught at the higher level and error() is called if
  exit_on_error is true.
(cherry picked from commit 81a654a342)
This commit is contained in:
Serhiy Storchaka 2024-06-28 17:52:07 +03:00 • committed by GitHub
parent 21a63b9c4c
commit 8ea6cc14a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 59 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/argparse.py
View file

@ -1843,7 +1843,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
# ==================================
def add_subparsers(self, **kwargs):
if self._subparsers is not None:
self.error(_('cannot have multiple subparser arguments'))
raise ArgumentError(None, _('cannot have multiple subparser arguments'))
# add the parser class to the arguments if it's not present
kwargs.setdefault('parser_class', type(self))
@ -1898,7 +1898,8 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
msg = _('unrecognized arguments: %s') % ' '.join(argv)
if self.exit_on_error:
self.error(msg)
raise ArgumentError(None, msg)
else:
raise ArgumentError(None, msg)
return args
def parse_known_args(self, args=None, namespace=None):
@ -2177,7 +2178,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
self._get_value(action, action.default))
if required_actions:
self.error(_('the following arguments are required: %s') %
raise ArgumentError(None, _('the following arguments are required: %s') %
', '.join(required_actions))
# make sure all required groups had one option present
@ -2193,7 +2194,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
for action in group._group_actions
if action.help is not SUPPRESS]
msg = _('one of the arguments %s is required')
self.error(msg % ' '.join(names))
raise ArgumentError(None, msg % ' '.join(names))
# return the updated namespace and the extra arguments
return namespace, extras
@ -2220,7 +2221,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
arg_strings = self._read_args_from_files(arg_strings)
new_arg_strings.extend(arg_strings)
except OSError as err:
self.error(str(err))
raise ArgumentError(None, str(err))
# return the modified argument list
return new_arg_strings
@ -2300,7 +2301,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
for action, option_string, sep, explicit_arg in option_tuples])
args = {'option': arg_string, 'matches': options}
msg = _('ambiguous option: %(option)s could match %(matches)s')
self.error(msg % args)
raise ArgumentError(None, msg % args)
# if exactly one action matched, this segmentation is good,
# so return the parsed action
@ -2360,7 +2361,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
# shouldn't ever get here
else:
self.error(_('unexpected option string: %s') % option_string)
raise ArgumentError(None, _('unexpected option string: %s') % option_string)
# return the collected option tuples
return result
@ -2417,8 +2418,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
def parse_intermixed_args(self, args=None, namespace=None):
args, argv = self.parse_known_intermixed_args(args, namespace)
if argv:
msg = _('unrecognized arguments: %s')
self.error(msg % ' '.join(argv))
msg = _('unrecognized arguments: %s') % ' '.join(argv)
if self.exit_on_error:
self.error(msg)
else:
raise ArgumentError(None, msg)
return args
def parse_known_intermixed_args(self, args=None, namespace=None):