| commit | 94c65d9a8ff8ec56c2420f46a6622803f7f1b154 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon May 25 03:10:48 2009 +0000 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon May 25 03:10:48 2009 +0000 |
| tree | 2b89b8c34e06c7a7c8b5b2076f551af956a0477e | |
| parent | 14a3dd716d2da4158739e502e8af8ef12e944cac [diff] [blame] |
Merged revisions 72907 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72907 | benjamin.peterson | 2009-05-24 21:40:21 -0500 (Sun, 24 May 2009) | 1 line handle errors from _PyObject_LookupSpecial when __get__ fails ........
diff --git a/Objects/object.c b/Objects/object.c index 58b70f0..a29c31a 100644 --- a/Objects/object.c +++ b/Objects/object.c
@@ -497,6 +497,8 @@ } return result; } + else if (PyErr_Occurred()) + return NULL; return PyBytes_FromObject(v); }