Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue 2582: Fix pickling of range objects.

This commit is contained in:
Alexandre Vassalotti 2008-06-10 04:03:04 +00:00
parent 1c9a2d96ec
commit 7505607ae7
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_range.py
View File

@ -2,6 +2,7 @@
import test.support, unittest import test.support, unittest
import sys import sys
import pickle
import warnings import warnings
warnings.filterwarnings("ignore", "integer argument expected", warnings.filterwarnings("ignore", "integer argument expected",
@ -61,6 +62,15 @@ class RangeTest(unittest.TestCase):
self.assertEqual(repr(range(1, 2)), 'range(1, 2)') self.assertEqual(repr(range(1, 2)), 'range(1, 2)')
self.assertEqual(repr(range(1, 2, 3)), 'range(1, 2, 3)') self.assertEqual(repr(range(1, 2, 3)), 'range(1, 2, 3)')
def test_pickling(self):
testcases = [(13,), (0, 11), (-22, 10), (20, 3, -1),
(13, 21, 3), (-2, 2, 2)]
for proto in range(pickle.HIGHEST_PROTOCOL):
for t in testcases:
r = range(*t)
self.assertEquals(list(pickle.loads(pickle.dumps(r, proto))),
list(r))
def test_main(): def test_main():
test.support.run_unittest(RangeTest) test.support.run_unittest(RangeTest)

9
Objects/rangeobject.c
View File

@ -252,6 +252,14 @@ range_repr(rangeobject *r)
r->start, r->stop, r->step); r->start, r->stop, r->step);
} }
/* Pickling support */
static PyObject *
range_reduce(rangeobject *r, PyObject *args)
{
return Py_BuildValue("(O(OOO))", Py_TYPE(r),
r->start, r->stop, r->step);
}
static PySequenceMethods range_as_sequence = { static PySequenceMethods range_as_sequence = {
(lenfunc)range_length, /* sq_length */ (lenfunc)range_length, /* sq_length */
0, /* sq_concat */ 0, /* sq_concat */
@ -269,6 +277,7 @@ PyDoc_STRVAR(reverse_doc,
static PyMethodDef range_methods[] = { static PyMethodDef range_methods[] = {
{"__reversed__", (PyCFunction)range_reverse, METH_NOARGS, {"__reversed__", (PyCFunction)range_reverse, METH_NOARGS,
reverse_doc}, reverse_doc},
{"__reduce__", (PyCFunction)range_reduce, METH_VARARGS},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };