diff options
| -rw-r--r-- | Lib/test/test_set.py | 2 | ||||
| -rw-r--r-- | Objects/setobject.c | 46 |
2 files changed, 25 insertions, 23 deletions
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index ee570f0..df72fb2 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -265,7 +265,7 @@ class TestJointOps(unittest.TestCase): self.assertEqual(repr(s), '{set(...)}') else: name = repr(s).partition('(')[0] # strip class name - self.assertEqual(repr(s), '%s([%s(...)])' % (name, name)) + self.assertEqual(repr(s), '%s({%s(...)})' % (name, name)) def test_cyclical_print(self): w = ReprWrapper() diff --git a/Objects/setobject.c b/Objects/setobject.c index 14d9155..2cc1743 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -571,6 +571,8 @@ set_repr(PySetObject *so) PyObject *keys, *result=NULL; Py_UNICODE *u; int status = Py_ReprEnter((PyObject*)so); + PyObject *listrepr; + Py_ssize_t newsize; if (status != 0) { if (status < 0) @@ -588,30 +590,30 @@ set_repr(PySetObject *so) if (keys == NULL) goto done; - if (Py_Type(so) != &PySet_Type) { - result = PyUnicode_FromFormat("%s(%R)", Py_Type(so)->tp_name, keys); + listrepr = PyObject_Repr(keys); + Py_DECREF(keys); + if (listrepr == NULL) { Py_DECREF(keys); + goto done; } - else { - PyObject *listrepr = PyObject_Repr(keys); - Py_ssize_t newsize; - Py_DECREF(keys); - if (listrepr == NULL) { - Py_DECREF(keys); - goto done; - } - newsize = PyUnicode_GET_SIZE(listrepr); - result = PyUnicode_FromUnicode(NULL, newsize); - if (result) { - u = PyUnicode_AS_UNICODE(result); - *u++ = '{'; - /* Omit the brackets from the listrepr */ - Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1, - PyUnicode_GET_SIZE(listrepr)-2); - u += newsize-2; - *u++ = '}'; - } - Py_DECREF(listrepr); + newsize = PyUnicode_GET_SIZE(listrepr); + result = PyUnicode_FromUnicode(NULL, newsize); + if (result) { + u = PyUnicode_AS_UNICODE(result); + *u++ = '{'; + /* Omit the brackets from the listrepr */ + Py_UNICODE_COPY(u, PyUnicode_AS_UNICODE(listrepr)+1, + PyUnicode_GET_SIZE(listrepr)-2); + u += newsize-2; + *u++ = '}'; + } + Py_DECREF(listrepr); + if (Py_Type(so) != &PySet_Type) { + PyObject *tmp = PyUnicode_FromFormat("%s(%U)", + Py_Type(so)->tp_name, + result); + Py_DECREF(result); + result = tmp; } done: Py_ReprLeave((PyObject*)so); |