Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix object_repr() to include the module (using the same rules as 

type_repr() for when to show or not to show it).
This commit is contained in:
Guido van Rossum 2001-08-16 18:52:43 +00:00
parent 3791838339
commit 76e6963fc1
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Objects/typeobject.c
View File

@ -912,9 +912,30 @@ object_dealloc(PyObject *self)
static PyObject *
object_repr(PyObject *self)
{
char buf[120];
PyTypeObject *type;
PyObject *mod, *name;
char buf[200];
sprintf(buf, "<%.80s object at %p>", self->ob_type->tp_name, self);
type = self->ob_type;
mod = type_module(type, NULL);
if (mod == NULL)
PyErr_Clear();
else if (!PyString_Check(mod)) {
Py_DECREF(mod);
mod = NULL;
}
name = type_name(type, NULL);
if (name == NULL)
return NULL;
if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__"))
sprintf(buf, "<%.80s.%.80s instance at %p>",
PyString_AS_STRING(mod),
PyString_AS_STRING(name),
self);
else
sprintf(buf, "<%.80s instance at %p>", type->tp_name, self);
Py_XDECREF(mod);
Py_DECREF(name);
return PyString_FromString(buf);
}