Add more tests

Update also outdated comment.

Author: vstinner

Lib/test/test_capi/test_misc.py

@@ -931,11 +931,19 @@ def test_tp_bases_slot_none(self):
     def test__pyerr_setkeyerror(self):
         # Test _PyErr_SetKeyError()
         _pyerr_setkeyerror = _testinternalcapi._pyerr_setkeyerror
-        with self.assertRaises(KeyError) as cm:
-            # Test _PyErr_SetKeyError() with an exception set to check
-            # that the function overrides the current exception
-            _pyerr_setkeyerror("key")
-        self.assertEqual(cm.exception.args, ("key",))
+        for arg in (
+            "key",
+            # check that a tuple argument is not unpacked
+            (1, 2, 3),
+            KeyError('arg'),
+        ):
+            with self.subTest(arg=arg):
+                with self.assertRaises(KeyError) as cm:
+                    # Test calling _PyErr_SetKeyError() with an exception set
+                    # to check that the function overrides the current
+                    # exception.
+                    _pyerr_setkeyerror(arg)
+                self.assertEqual(cm.exception.args, (arg,))
 
 
 @requires_limited_api

Python/errors.c

@@ -246,9 +246,7 @@ PyErr_SetObject(PyObject *exception, PyObject *value)
     _PyErr_SetObject(tstate, exception, value);
 }
 
-/* Set a key error with the specified argument, wrapping it in a
- * tuple automatically so that tuple keys are not unpacked as the
- * exception arguments.
+/* Set a key error with the specified argument.
  *
  * If an exception is already set, override the exception. */
 void