(original) (raw)

changeset: 85416:8fb3a6f9b0a4 user: Victor Stinner vstinner@wyplay.com date: Mon Aug 26 14:05:19 2013 +0200 files: Objects/object.c Objects/typeobject.c description: Restore changeset 5bd9db528aed (issue #18408) "Issue #18408: PyObject_Str(), PyObject_Repr() and type_call() now fail with an assertion error if they are called with an exception set (PyErr_Occurred()). As PyEval_EvalFrameEx(), they may clear the current exception and so the caller looses its exception." diff -r e63f19d0a651 -r 8fb3a6f9b0a4 Objects/object.c --- a/Objects/object.c Mon Aug 26 14:04:10 2013 +0200 +++ b/Objects/object.c Mon Aug 26 14:05:19 2013 +0200 @@ -449,6 +449,14 @@ if (Py_TYPE(v)->tp_repr == NULL) return PyUnicode_FromFormat("<%s object at %p>", v->ob_type->tp_name, v); + +#ifdef Py_DEBUG + /* PyObject_Repr() must not be called with an exception set, + because it may clear it (directly or indirectly) and so the + caller looses its exception */ + assert(!PyErr_Occurred()); +#endif + res = (*v->ob_type->tp_repr)(v); if (res == NULL) return NULL; @@ -491,6 +499,13 @@ if (Py_TYPE(v)->tp_str == NULL) return PyObject_Repr(v); +#ifdef Py_DEBUG + /* PyObject_Str() must not be called with an exception set, + because it may clear it (directly or indirectly) and so the + caller looses its exception */ + assert(!PyErr_Occurred()); +#endif + /* It is possible for a type to have a tp_str representation that loops infinitely. */ if (Py_EnterRecursiveCall(" while getting the str of an object")) diff -r e63f19d0a651 -r 8fb3a6f9b0a4 Objects/typeobject.c --- a/Objects/typeobject.c Mon Aug 26 14:04:10 2013 +0200 +++ b/Objects/typeobject.c Mon Aug 26 14:05:19 2013 +0200 @@ -736,6 +736,13 @@ return NULL; } +#ifdef Py_DEBUG + /* type_call() must not be called with an exception set, + because it may clear it (directly or indirectly) and so the + caller looses its exception */ + assert(!PyErr_Occurred()); +#endif + obj = type->tp_new(type, args, kwds); if (obj != NULL) { /* Ugly exception: when the call was type(something), /vstinner@wyplay.com