From: Brett Cannon Date: Sun, 30 Sep 2007 20:37:19 +0000 (+0000) Subject: Fix error introduced by r58288; if a tuple is length 0 return its repr and X-Git-Tag: v2.6a1~1242 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31ba8480d823f2c424d77ccd8c446b79ca48c1ce;p=python Fix error introduced by r58288; if a tuple is length 0 return its repr and don't worry about any self-referring tuples. --- diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 38304dda18..b1704f7be4 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -216,6 +216,10 @@ tuplerepr(PyTupleObject *v) PyObject *s, *temp; PyObject *pieces, *result = NULL; + n = Py_Size(v); + if (n == 0) + return PyString_FromString("()"); + /* While not mutable, it is still possible to end up with a cycle in a tuple through an object that stores itself within a tuple (and thus infinitely asks for the repr of itself). This should only be @@ -225,10 +229,6 @@ tuplerepr(PyTupleObject *v) return i > 0 ? PyString_FromString("(...)") : NULL; } - n = Py_Size(v); - if (n == 0) - return PyString_FromString("()"); - pieces = PyTuple_New(n); if (pieces == NULL) return NULL;