diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-05-25 02:40:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-05-25 02:40:21 (GMT) |
| commit | 87e5006d8c5974597df9e3074b95227187d32be3 (patch) | |
| tree | 82f8ff2dae761cdf19eeec36806f3bbb35b439e1 /Objects/object.c | |
| parent | 176a56c69b1563c4a8ac0d8f974b4271177c80ee (diff) | |
| download | cpython-87e5006d8c5974597df9e3074b95227187d32be3.zip cpython-87e5006d8c5974597df9e3074b95227187d32be3.tar.gz cpython-87e5006d8c5974597df9e3074b95227187d32be3.tar.bz2 | |
handle errors from _PyObject_LookupSpecial when __get__ fails
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/object.c b/Objects/object.c index 08abe71..95072af 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -509,6 +509,8 @@ PyObject_Unicode(PyObject *v) res = PyObject_CallFunctionObjArgs(func, NULL); Py_DECREF(func); } + else if (PyErr_Occurred()) + return NULL; } /* Didn't find __unicode__ */ |