From: Guido van Rossum <guido@python.org>
Date: Mon, 24 Sep 2001 16:03:59 +0000 (+0000)
Subject: Fix the baffler that Tim reported: sometimes the repr() of an object
X-Git-Tag: v2.2.1c1~1658
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff0e6d6ef542b5b4f3c31786aa152cec68598d4f;p=python

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 ...>.
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 2f540af648..9e8565f8a4 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 1842f3c855..20c149ec6e 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);