mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Back out 5bd9db528aed (issue #18408). It caused unsolved buildbot failures.

Browse source
This commit is contained in:
Antoine Pitrou 2013-08-23 23:18:20 +02:00
parent 0acbcb5bbe
commit 91541931f5
2 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Objects/object.c
View file

@ -443,14 +443,6 @@ PyObject_Repr(PyObject *v)
if (Py_TYPE(v)->tp_repr == NULL) if (Py_TYPE(v)->tp_repr == NULL)
return PyUnicode_FromFormat("<%s object at %p>", return PyUnicode_FromFormat("<%s object at %p>",
v->ob_type->tp_name, v); 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); res = (*v->ob_type->tp_repr)(v);
if (res == NULL) if (res == NULL)
return NULL; return NULL;
@ -482,7 +474,6 @@ PyObject_Str(PyObject *v)
#endif #endif
if (v == NULL) if (v == NULL)
return PyUnicode_FromString("<NULL>"); return PyUnicode_FromString("<NULL>");
if (PyUnicode_CheckExact(v)) { if (PyUnicode_CheckExact(v)) {
#ifndef Py_DEBUG #ifndef Py_DEBUG
if (PyUnicode_READY(v) < 0) if (PyUnicode_READY(v) < 0)
@ -494,13 +485,6 @@ PyObject_Str(PyObject *v)
if (Py_TYPE(v)->tp_str == NULL) if (Py_TYPE(v)->tp_str == NULL)
return PyObject_Repr(v); 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 /* It is possible for a type to have a tp_str representation that loops
infinitely. */ infinitely. */
if (Py_EnterRecursiveCall(" while getting the str of an object")) if (Py_EnterRecursiveCall(" while getting the str of an object"))

7
Objects/typeobject.c
View file

@ -736,13 +736,6 @@ type_call(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL; 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); obj = type->tp_new(type, args, kwds);
if (obj != NULL) { if (obj != NULL) {
/* Ugly exception: when the call was type(something), /* Ugly exception: when the call was type(something),