Extend solution to parse_intermixed_args()

python · jacobtylerwalls · Jan 23, 2022 · Jan 24, 2022 · Jan 29, 2022 · Jan 29, 2022
commit 7e16f627b8d43929ca11cf6d4f4cc5cff0d16efb
@@ -2395,7 +2395,10 @@ 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))
+            formatted_msg = msg % ' '.join(argv)
+            if self.exit_on_error:
+                self.error(formatted_msg)
+            raise ArgumentError(None, formatted_msg)
         return args
 
     def parse_known_intermixed_args(self, args=None, namespace=None):

@@ -5614,6 +5614,8 @@ def test_exit_on_error_unknown_arg(self):
         msg = 'unrecognized arguments: --unknown'
         with self.assertRaisesRegex(argparse.ArgumentError, msg):
             self.parser.parse_args('--integers 4 --unknown'.split())
+        with self.assertRaisesRegex(argparse.ArgumentError, msg.replace('--', '')):
+            self.parser.parse_intermixed_args('--integers 4 unknown'.split())
 
     def test_exit_on_error_mutually_exclusive_group(self):
         other_parser = argparse.ArgumentParser(exit_on_error=False)