diff options
author | Benjamin Peterson <benjamin@python.org> | 2012-04-24 15:06:25 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2012-04-24 15:06:25 (GMT) |
commit | 7b1668735ace947474bb94f812c03b39bd963a77 (patch) | |
tree | 1b5858e50db5decab64c00ccd4300d412172eea1 /Objects | |
parent | 790e005669912adcbe81073284c982a5b844d2d3 (diff) | |
download | cpython-7b1668735ace947474bb94f812c03b39bd963a77.zip cpython-7b1668735ace947474bb94f812c03b39bd963a77.tar.gz cpython-7b1668735ace947474bb94f812c03b39bd963a77.tar.bz2 |
don't use a slot wrapper from a different special method (closes #14658)
This also alters the fix to #11603. Specifically, setting __repr__ to
object.__str__ now raises a recursion RuntimeError when str() or repr() is
called instead of silently bypassing the recursion. I believe this behavior is
more correct.
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/typeobject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 8cfa889..13a20f7 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2928,7 +2928,7 @@ object_str(PyObject *self) unaryfunc f; f = Py_TYPE(self)->tp_repr; - if (f == NULL || f == object_str) + if (f == NULL) f = object_repr; return f(self); } @@ -5757,7 +5757,8 @@ update_one_slot(PyTypeObject *type, slotdef *p) } continue; } - if (Py_TYPE(descr) == &PyWrapperDescr_Type) { + if (Py_TYPE(descr) == &PyWrapperDescr_Type && + ((PyWrapperDescrObject *)descr)->d_base->name_strobj == p->name_strobj) { void **tptr = resolve_slotdups(type, p->name_strobj); if (tptr == NULL || tptr == ptr) generic = p->function; |