Commit 13936697 authored by Raymond Hettinger's avatar Raymond Hettinger

SF 1191699: Make slices picklable

parent c02e1312
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import unittest import unittest
from test import test_support from test import test_support
from cPickle import loads, dumps
import sys import sys
...@@ -102,6 +103,13 @@ class SliceTest(unittest.TestCase): ...@@ -102,6 +103,13 @@ class SliceTest(unittest.TestCase):
x[1:2] = 42 x[1:2] = 42
self.assertEquals(tmp, [(1, 2, 42)]) self.assertEquals(tmp, [(1, 2, 42)])
def test_pickle(self):
s = slice(10, 20, 3)
for protocol in (0,1,2):
t = loads(dumps(s, protocol))
self.assertEqual(s, t)
self.assertEqual(s.indices(15), t.indices(15))
self.assertNotEqual(id(s), id(t))
def test_main(): def test_main():
test_support.run_unittest(SliceTest) test_support.run_unittest(SliceTest)
......
...@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1? ...@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
Core and builtins Core and builtins
----------------- -----------------
- Request #1191699: Slices can now be pickled.
- Patch #1682205: a TypeError while unpacking an iterable is no longer - Patch #1682205: a TypeError while unpacking an iterable is no longer
masked by a generic one with the message "unpack non-sequence". masked by a generic one with the message "unpack non-sequence".
......
...@@ -274,9 +274,19 @@ indices, and the stride length of the extended slice described by\n\ ...@@ -274,9 +274,19 @@ indices, and the stride length of the extended slice described by\n\
S. Out of bounds indices are clipped in a manner consistent with the\n\ S. Out of bounds indices are clipped in a manner consistent with the\n\
handling of normal slices."); handling of normal slices.");
static PyObject *
slice_reduce(PySliceObject* self)
{
return Py_BuildValue("O(OOO)", self->ob_type, self->start, self->stop, self->step);
}
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
static PyMethodDef slice_methods[] = { static PyMethodDef slice_methods[] = {
{"indices", (PyCFunction)slice_indices, {"indices", (PyCFunction)slice_indices,
METH_O, slice_indices_doc}, METH_O, slice_indices_doc},
{"__reduce__", (PyCFunction)slice_reduce,
METH_NOARGS, reduce_doc},
{NULL, NULL} {NULL, NULL}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment