mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-28 12:31:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change the repr() of frozenset instances (and set subclasses)

Browse Source 
from name([e1, e2, ...]) to name({e1, e2, ...}).
This makes more sense now we have the set notation.
This commit is contained in:
Guido van Rossum 2007-08-07 22:44:20 +00:00
parent 0cb85a972f
commit bdba5cf694
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_set.py
View File

@ -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()

46
Objects/setobject.c
View File

@ -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);