traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dict_get(): New method for item access with different semantics than 

__getitem__().  This method never raises an exception; if the key is
not in the dictionary, the second (optional) argument is returned.  If
the second argument is not provided and the key is missing, None is
returned.

mapp_methods: added "get" method.
This commit is contained in:
Barry Warsaw 1997-10-06 17:49:20 +00:00
parent 596db3161c
commit c38c5da5d0
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Objects/dictobject.c
View File

@ -952,6 +952,43 @@ dict_has_key(mp, args)
return PyInt_FromLong(ok);
}
static PyObject *
dict_get(mp, args)
register dictobject *mp;
PyObject *args;
{
PyObject *key;
PyObject *failobj = NULL;
PyObject *val = NULL;
long hash;
if (mp->ma_table == NULL)
goto finally;
if (!PyArg_ParseTuple(args, "O|O", &key, &failobj))
return NULL;
if (failobj == NULL)
failobj = Py_None;
#ifdef CACHE_HASH
if (!PyString_Check(key) ||
(hash = ((PyStringObject *) key)->ob_shash) == -1)
#endif
{
hash = PyObject_Hash(key);
if (hash == -1)
return NULL;
}
val = lookdict(mp, key, hash)->me_value;
finally:
if (val == NULL)
val = failobj;
Py_INCREF(val);
return val;
}
static PyObject *
dict_clear(mp, args)
register dictobject *mp;
@ -972,6 +1009,7 @@ static PyMethodDef mapp_methods[] = {
{"update", (PyCFunction)dict_update},
{"clear", (PyCFunction)dict_clear},
{"copy", (PyCFunction)dict_copy},
{"get", (PyCFunction)dict_get, 1},
{NULL, NULL} /* sentinel */
};