mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Simplify previous checkin -- a new function was not needed.

Browse source
This commit is contained in:
Raymond Hettinger 2003-12-13 13:31:55 +00:00
parent d3ae6729e7
commit 0c66967e3d
1 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Objects/dictobject.c
View file

@ -498,31 +498,6 @@ PyDict_GetItem(PyObject *op, PyObject *key)
return (mp->ma_lookup)(mp, key, hash)->me_value;
}
static PyObject *
dict_getitem(PyObject *op, PyObject *key)
{
long hash;
dictobject *mp = (dictobject *)op;
PyObject *v;
if (!PyDict_Check(op)) {
return NULL;
}
if (!PyString_CheckExact(key) ||
(hash = ((PyStringObject *) key)->ob_shash) == -1)
{
hash = PyObject_Hash(key);
if (hash == -1)
return NULL;
}
v = (mp->ma_lookup)(mp, key, hash) -> me_value;
if (v == NULL)
PyErr_SetObject(PyExc_KeyError, key);
else
Py_INCREF(v);
return v;
}
/* CAUTION: PyDict_SetItem() must guarantee that it won't resize the
* dictionary if it is merely replacing the value for an existing key.
* This is means that it's safe to loop over a dictionary with
@ -1813,7 +1788,7 @@ PyDoc_STRVAR(iteritems__doc__,
static PyMethodDef mapp_methods[] = {
{"__contains__",(PyCFunction)dict_has_key, METH_O | METH_COEXIST,
contains__doc__},
{"__getitem__", (PyCFunction)dict_getitem, METH_O | METH_COEXIST,
{"__getitem__", (PyCFunction)dict_subscript, METH_O | METH_COEXIST,
getitem__doc__},
{"has_key", (PyCFunction)dict_has_key, METH_O,
has_key__doc__},