Factor-out the common code for setting a KeyError.

diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index a279d81541c59694f05206f0cb56e19be5ce5c6b..f89d1add20a4a1852b9783b0c841d64ff01e7b38 100644 (file)
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -75,6 +75,7 @@ typedef PyOSErrorObject PyWindowsErrorObject;
 
 PyAPI_FUNC(void) PyErr_SetNone(PyObject *);
 PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *);
+PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *);
 PyAPI_FUNC(void) PyErr_SetString(
     PyObject *exception,
     const char *string   /* decoded from utf-8 */

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index b5cbfb1f253cb954c87df4a39044a4d00c253008..bbee1a61a3ab4ff86ddb8d02f2b33dff50751fcf 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -95,20 +95,6 @@ To avoid slowing down lookups on a near-full table, we resize the table when
 it's USABLE_FRACTION (currently two-thirds) full.
 */
 
-/* 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. */
-static void
-set_key_error(PyObject *arg)
-{
-    PyObject *tup;
-    tup = PyTuple_Pack(1, arg);
-    if (!tup)
-        return; /* caller will expect error to be set anyway */
-    PyErr_SetObject(PyExc_KeyError, tup);
-    Py_DECREF(tup);
-}
-
 #define PERTURB_SHIFT 5
 
 /*
@@ -1241,7 +1227,7 @@ PyDict_DelItem(PyObject *op, PyObject *key)
     if (ep == NULL)
         return -1;
     if (*value_addr == NULL) {
-        set_key_error(key);
+        _PyErr_SetKeyError(key);
         return -1;
     }
     old_value = *value_addr;
@@ -1530,7 +1516,7 @@ dict_subscript(PyDictObject *mp, PyObject *key)
             else if (PyErr_Occurred())
                 return NULL;
         }
-        set_key_error(key);
+        _PyErr_SetKeyError(key);
         return NULL;
     }
     else
@@ -2302,7 +2288,7 @@ dict_pop(PyDictObject *mp, PyObject *args)
             Py_INCREF(deflt);
             return deflt;
         }
-        set_key_error(key);
+        _PyErr_SetKeyError(key);
         return NULL;
     }
     if (!PyUnicode_CheckExact(key) ||
@@ -2320,7 +2306,7 @@ dict_pop(PyDictObject *mp, PyObject *args)
             Py_INCREF(deflt);
             return deflt;
         }
-        set_key_error(key);
+        _PyErr_SetKeyError(key);
         return NULL;
     }
     *value_addr = NULL;

diff --git a/Objects/setobject.c b/Objects/setobject.c
index 8a3d4f2141b834d354fe55ca2c87cbab5b1a5086..524bda915608e2c58dbe0c26b5ea02908cb97d41 100644 (file)
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -11,20 +11,6 @@
 #include "structmember.h"
 #include "stringlib/eq.h"
 
-/* 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. */
-static void
-set_key_error(PyObject *arg)
-{
-    PyObject *tup;
-    tup = PyTuple_Pack(1, arg);
-    if (!tup)
-        return; /* caller will expect error to be set anyway */
-    PyErr_SetObject(PyExc_KeyError, tup);
-    Py_DECREF(tup);
-}
-
 /* This must be >= 1. */
 #define PERTURB_SHIFT 5
 #define LINEAR_PROBES 9
@@ -1948,7 +1934,7 @@ set_remove(PySetObject *so, PyObject *key)
     }
 
     if (rv == DISCARD_NOTFOUND) {
-        set_key_error(key);
+        _PyErr_SetKeyError(key);
         return NULL;
     }
     Py_RETURN_NONE;

diff --git a/Python/errors.c b/Python/errors.c
index 93b11201916bfe776b5bcf1355e7c152d8f46230..b67448090f91016bc12aa62f4fa70fbdb162e0b9 100644 (file)
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -117,6 +117,20 @@ PyErr_SetObject(PyObject *exception, PyObject *value)
     PyErr_Restore(exception, value, tb);
 }
 
+/* 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. */
+void
+_PyErr_SetKeyError(PyObject *arg)
+{
+    PyObject *tup;
+    tup = PyTuple_Pack(1, arg);
+    if (!tup)
+        return; /* caller will expect error to be set anyway */
+    PyErr_SetObject(PyExc_KeyError, tup);
+    Py_DECREF(tup);
+}
+
 void
 PyErr_SetNone(PyObject *exception)
 {