Mercurial > cpython-lru_cache-weakref

diff Objects/object.c @ 2160:899b4e3dfd4c legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix strobject() behavior
author Guido van Rossum <guido@python.org>
date Tue, 17 Jan 1995 16:35:13 +0000
parents 36847b8b575d
children 0b0b18d655d2
line wrap: on
line diff
--- a/Objects/object.c	Tue Jan 17 16:34:45 1995 +0000
+++ b/Objects/object.c	Tue Jan 17 16:35:13 1995 +0000
@@ -181,11 +181,13 @@
 		INCREF(v);
 		return v;
 	}
+	else if (v->ob_type->tp_str != NULL)
+		return (*v->ob_type->tp_str)(v);
 	else {
-		object *func = getattr(v, "__str__");
+		object *func;
 		object *args;
 		object *res;
-		if (func == NULL) {
+		if (!is_instanceobject(v) || (func = getattr(v, "__str__")) == NULL) {
 			err_clear();
 			return reprobject(v);
 		}