mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 23:51:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Issue #26146: marshal.loads() now uses the empty frozenset singleton

Browse source
This commit is contained in:
Victor Stinner 2016-01-23 14:15:48 +01:00
parent 5ebe2c89fe
commit 1aa78938b0
2 changed files with 50 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_marshal.py
View file

@ -135,6 +135,13 @@ class ContainerTestCase(unittest.TestCase, HelperMixin):
for constructor in (set, frozenset): for constructor in (set, frozenset):
self.helper(constructor(self.d.keys())) self.helper(constructor(self.d.keys()))
@support.cpython_only
def test_empty_frozenset_singleton(self):
# marshal.loads() must reuse the empty frozenset singleton
obj = frozenset()
obj2 = marshal.loads(marshal.dumps(obj))
self.assertIs(obj2, obj)
class BufferTestCase(unittest.TestCase, HelperMixin): class BufferTestCase(unittest.TestCase, HelperMixin):

11
Python/marshal.c
View file

@ -1266,6 +1266,16 @@ r_object(RFILE *p)
PyErr_SetString(PyExc_ValueError, "bad marshal data (set size out of range)"); PyErr_SetString(PyExc_ValueError, "bad marshal data (set size out of range)");
break; break;
} }
if (n == 0 && type == TYPE_FROZENSET) {
/* call frozenset() to get the empty frozenset singleton */
v = PyObject_CallFunction((PyObject*)&PyFrozenSet_Type, NULL);
if (v == NULL)
break;
R_REF(v);
retval = v;
}
else {
v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL); v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL);
if (type == TYPE_SET) { if (type == TYPE_SET) {
R_REF(v); R_REF(v);
@ -1301,6 +1311,7 @@ r_object(RFILE *p)
if (type != TYPE_SET) if (type != TYPE_SET)
v = r_ref_insert(v, idx, flag, p); v = r_ref_insert(v, idx, flag, p);
retval = v; retval = v;
}
break; break;
case TYPE_CODE: case TYPE_CODE: