| commit | 32b582b953f5859de325496df1da9731234b17fa | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Tue Jan 17 16:35:13 1995 +0000 |
| committer | Guido van Rossum <guido@python.org> | Tue Jan 17 16:35:13 1995 +0000 |
| tree | bc36cc7a397244a6b687bee531c6a47dc432875a | |
| parent | b0fe3a9312a9d50f4dde4de351897beb7d39bebf [diff] [blame] |
fix strobject() behavior
diff --git a/Objects/object.c b/Objects/object.c index be3cce7..63c55ce 100644 --- a/Objects/object.c +++ b/Objects/object.c
@@ -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); }