diff Objects/object.c @ 2827:ff1faa4cc1df legacy-trunk

args to call_object must be tuple or NULL
author Guido van Rossum <guido@python.org>
date Wed, 12 Jul 1995 02:22:06 +0000
parents f11ba9cc342f
children 54aa87b1ccee
line wrap: on
line diff
--- a/Objects/object.c	Wed Jul 12 02:17:51 1995 +0000
+++ b/Objects/object.c	Wed Jul 12 02:22:06 1995 +0000
@@ -177,7 +177,7 @@
 {
 	if (v == NULL)
 		return newstringobject("<NULL>");
-	if (is_stringobject(v)) {
+	else if (is_stringobject(v)) {
 		INCREF(v);
 		return v;
 	}
@@ -185,19 +185,13 @@
 		return (*v->ob_type->tp_str)(v);
 	else {
 		object *func;
-		object *args;
 		object *res;
-		if (!is_instanceobject(v) || (func = getattr(v, "__str__")) == NULL) {
+		if (!is_instanceobject(v) ||
+		    (func = getattr(v, "__str__")) == NULL) {
 			err_clear();
 			return reprobject(v);
 		}
-		args = newtupleobject(0);
-		if (args == NULL)
-			res = NULL;
-		else {
-			res = call_object(func, args);
-			DECREF(args);
-		}
+		res = call_object(func, (object *)NULL);
 		DECREF(func);
 		return res;
 	}