Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Factor-out the common code for setting a KeyError.

This commit is contained in:
Raymond Hettinger 2013-09-02 15:59:26 -07:00
parent 7f5c22c022
commit 69492dab07
4 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Include/pyerrors.h
View File

@ -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 */

22
Objects/dictobject.c
View File

@ -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;

16
Objects/setobject.c
View File

@ -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;

14
Python/errors.c
View File

@ -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)
{