diff options
| author | Guido van Rossum <guido@python.org> | 2001-09-24 16:03:59 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2001-09-24 16:03:59 (GMT) |
| commit | ff0e6d6ef542b5b4f3c31786aa152cec68598d4f (patch) | |
| tree | 69a9517a7f7d6616a1c24d719f6a974daf1d00f2 | |
| parent | f244b2e47c3d8b60c03225916cb6f80db8b81d57 (diff) | |
| download | cpython-ff0e6d6ef542b5b4f3c31786aa152cec68598d4f.zip cpython-ff0e6d6ef542b5b4f3c31786aa152cec68598d4f.tar.gz cpython-ff0e6d6ef542b5b4f3c31786aa152cec68598d4f.tar.bz2 | |
Fix the baffler that Tim reported: sometimes the repr() of an object
looks like <X object at ...>, sometimes it says <X instance at ...>.
Make this uniformly say <X object at ...>.
| -rw-r--r-- | Lib/test/test_descr.py | 4 | ||||
| -rw-r--r-- | Objects/typeobject.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 2f540af..9e8565f 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -1193,7 +1193,7 @@ def specials(): verify(not c1 == c2) # Note that the module name appears in str/repr, and that varies # depending on whether this test is run standalone or from a framework. - verify(str(c1).find('C instance at ') >= 0) + verify(str(c1).find('C object at ') >= 0) verify(str(c1) == repr(c1)) verify(-1 not in c1) for i in range(10): @@ -1216,7 +1216,7 @@ def specials(): verify(not d1 == d2) # Note that the module name appears in str/repr, and that varies # depending on whether this test is run standalone or from a framework. - verify(str(d1).find('D instance at ') >= 0) + verify(str(d1).find('D object at ') >= 0) verify(str(d1) == repr(d1)) verify(-1 not in d1) for i in range(10): diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 1842f3c..20c149e 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1157,12 +1157,12 @@ object_repr(PyObject *self) if (name == NULL) return NULL; if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__")) - rtn = PyString_FromFormat("<%s.%s instance at %p>", + rtn = PyString_FromFormat("<%s.%s object at %p>", PyString_AS_STRING(mod), PyString_AS_STRING(name), self); else - rtn = PyString_FromFormat("<%s instance at %p>", + rtn = PyString_FromFormat("<%s object at %p>", type->tp_name, self); Py_XDECREF(mod); Py_DECREF(name); |