fix strobject() behavior

32b582b9 · Guido van Rossum · b0fe3a93 · 32b582b9
Commit 32b582b9 authored Jan 17, 1995 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Objects/object.c Objects/object.c +4 -2

No files found.
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -181,11 +181,13 @@ strobject(v)
 		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);
 		}