Make all error paths raise ArgumentError

python · jacobtylerwalls · Jan 23, 2022 · Jan 24, 2022 · Jan 29, 2022 · Jan 29, 2022
commit 0fc30d319940da54ec2aa13f913d66bb4ab8b1fa
@@ -2111,8 +2111,11 @@ def consume_positionals(start_index):
                                 self._get_value(action, action.default))
 
         if required_actions:
-            self.error(_('the following arguments are required: %s') %
-                       ', '.join(required_actions))
+            raise ArgumentError(
+                None,
+                _('the following arguments are required: %s') %
+                ', '.join(required_actions)
+            )
 
         # make sure all required groups had one option present
         for group in self._mutually_exclusive_groups:
@@ -2127,7 +2130,10 @@ def consume_positionals(start_index):
                              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
@@ -2591,13 +2597,11 @@ def error(self, message):
         """error(message: string)
 
         Prints a usage message incorporating the message to stderr and
-        exits (or raises ArgumentError if exit_on_error is False).
+        exits.
 
         If you override this in a subclass, it should not return -- it
         should either exit or raise an exception.
         """
         self.print_usage(_sys.stderr)
         args = {'prog': self.prog, 'message': message}
-        if self.exit_on_error:
-            self.exit(2, _('%(prog)s: error: %(message)s\n') % args)
-        raise ArgumentError(None, message)
+        self.exit(2, _('%(prog)s: error: %(message)s\n') % args)