| commit | 87e5006d8c5974597df9e3074b95227187d32be3 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon May 25 02:40:21 2009 +0000 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon May 25 02:40:21 2009 +0000 |
| tree | 82f8ff2dae761cdf19eeec36806f3bbb35b439e1 | |
| parent | 176a56c69b1563c4a8ac0d8f974b4271177c80ee [diff] [blame] |
handle errors from _PyObject_LookupSpecial when __get__ fails
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 @@ res = PyObject_CallFunctionObjArgs(func, NULL); Py_DECREF(func); } + else if (PyErr_Occurred()) + return NULL; } /* Didn't find __unicode__ */