diff options
Diffstat (limited to 'Objects/dictobject.c')
| -rw-r--r-- | Objects/dictobject.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index e5a4610..e47e6b3 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -958,19 +958,13 @@ dict_get(mp, args) PyObject *args; { PyObject *key; - PyObject *failobj = NULL; + PyObject *failobj = Py_None; 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) @@ -981,7 +975,7 @@ dict_get(mp, args) return NULL; } val = lookdict(mp, key, hash)->me_value; - finally: + if (val == NULL) val = failobj; Py_INCREF(val); |