diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-07-15 19:19:27 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-07-15 19:19:27 (GMT) |
commit | 91fe8157fd3518fcf7c2f7cd7bd247131e8e839f (patch) | |
tree | ed19f5dfb61e1653213cc3f2cfb97d07fcf1455f /Objects/typeobject.c | |
parent | 2ca3ffb0989e53f8ae70f7177e97f43ac1d1af98 (diff) | |
parent | 9b43b6e14e65b6086d0d3227cfd600d4bbb38cc2 (diff) | |
download | cpython-91fe8157fd3518fcf7c2f7cd7bd247131e8e839f.zip cpython-91fe8157fd3518fcf7c2f7cd7bd247131e8e839f.tar.gz cpython-91fe8157fd3518fcf7c2f7cd7bd247131e8e839f.tar.bz2 |
Merge
Diffstat (limited to 'Objects/typeobject.c')
-rw-r--r-- | Objects/typeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 1642dad..d80b594 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2968,7 +2968,7 @@ object_str(PyObject *self) unaryfunc f; f = Py_TYPE(self)->tp_repr; - if (f == NULL) + if (f == NULL || f == object_str) f = object_repr; return f(self); } |