mirror of
https://github.com/python/cpython.git
synced 2025-12-31 04:23:37 +00:00
Issue #15022: Ensure all pickle protocols are supported.
This commit is contained in:
parent
dcbe46bc5b
commit
9d05c8c0e0
2 changed files with 32 additions and 4 deletions
|
|
@ -1159,10 +1159,15 @@ class Spam(types.SimpleNamespace):
|
|||
def test_pickle(self):
|
||||
ns = types.SimpleNamespace(breakfast="spam", lunch="spam")
|
||||
|
||||
ns_pickled = pickle.dumps(ns)
|
||||
ns_roundtrip = pickle.loads(ns_pickled)
|
||||
for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
|
||||
pname = "protocol {}".format(protocol)
|
||||
try:
|
||||
ns_pickled = pickle.dumps(ns, protocol)
|
||||
except TypeError as e:
|
||||
raise TypeError(pname) from e
|
||||
ns_roundtrip = pickle.loads(ns_pickled)
|
||||
|
||||
self.assertEqual(ns, ns_roundtrip)
|
||||
self.assertEqual(ns, ns_roundtrip, pname)
|
||||
|
||||
|
||||
def test_main():
|
||||
|
|
|
|||
|
|
@ -173,6 +173,29 @@ namespace_richcompare(PyObject *self, PyObject *other, int op)
|
|||
}
|
||||
|
||||
|
||||
PyDoc_STRVAR(namespace_reduce__doc__, "Return state information for pickling");
|
||||
|
||||
static PyObject *
|
||||
namespace_reduce(register _PyNamespaceObject *ns)
|
||||
{
|
||||
PyObject *result, *args = PyTuple_New(0);
|
||||
|
||||
if (!args)
|
||||
return NULL;
|
||||
|
||||
result = PyTuple_Pack(3, (PyObject *)Py_TYPE(ns), args, ns->ns_dict);
|
||||
Py_DECREF(args);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
static PyMethodDef namespace_methods[] = {
|
||||
{"__reduce__", (PyCFunction)namespace_reduce, METH_NOARGS,
|
||||
namespace_reduce__doc__},
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
||||
PyDoc_STRVAR(namespace_doc,
|
||||
"A simple attribute-based namespace.\n\
|
||||
\n\
|
||||
|
|
@ -207,7 +230,7 @@ PyTypeObject _PyNamespace_Type = {
|
|||
0, /* tp_weaklistoffset */
|
||||
0, /* tp_iter */
|
||||
0, /* tp_iternext */
|
||||
0, /* tp_methods */
|
||||
namespace_methods, /* tp_methods */
|
||||
namespace_members, /* tp_members */
|
||||
0, /* tp_getset */
|
||||
0, /* tp_base */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue