Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Well darnit! The innocuous fix I made to PyObject_Print() caused 

printing of instances not to look for __str__().  Fix this.
This commit is contained in:
Guido van Rossum 2001-04-30 14:39:18 +00:00
parent cab3f68f61
commit 82c690f11a
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Objects/classobject.c
View File

@ -781,6 +781,25 @@ instance_repr(PyInstanceObject *inst)
return res;
}
static PyObject *
instance_str(PyInstanceObject *inst)
{
PyObject *func;
PyObject *res;
static PyObject *strstr;
if (strstr == NULL)
strstr = PyString_InternFromString("__str__");
func = instance_getattr(inst, strstr);
if (func == NULL) {
PyErr_Clear();
return instance_repr(inst);
}
res = PyEval_CallObject(func, (PyObject *)NULL);
Py_DECREF(func);
return res;
}
static long
instance_hash(PyInstanceObject *inst)
{
@ -1827,7 +1846,7 @@ PyTypeObject PyInstance_Type = {
&instance_as_mapping, /* tp_as_mapping */
(hashfunc)instance_hash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
(reprfunc)instance_str, /* tp_str */
(getattrofunc)instance_getattr, /* tp_getattro */
(setattrofunc)instance_setattr, /* tp_setattro */
0, /* tp_as_buffer */