Skip to content

bpo-36068: Make _tuplegetter objects serializable #11981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhettinger merged 2 commits into from
Feb 21, 2019
Merged

bpo-36068: Make _tuplegetter objects serializable #11981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f77a1ae
Make _tuplegetter objects serializable
Feb 21, 2019
c60c672
Add contributor
rhettinger Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/whatsnew/3.8.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ Optimizations
* Sped-up field lookups in :func:`collections.namedtuple`. They are now more
than two times faster, making them the fastest form of instance variable
lookup in Python. (Contributed by Raymond Hettinger, Pablo Galindo, and
Serhiy Storchaka in :issue:`32492`.)
Joe Jevnik, Serhiy Storchaka in :issue:`32492`.)

* The :class:`list` constructor does not overallocate the internal item buffer
if the input iterable has a known length (the input implements ``__len__``).
Expand Down
11 changes: 10 additions & 1 deletion Lib/test/test_collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import types
import unittest

from collections import namedtuple, Counter, OrderedDict, _count_elements
from collections import namedtuple, Counter, OrderedDict, _count_elements, _tuplegetter
from collections import UserDict, UserString, UserList
from collections import ChainMap
from collections import deque
Expand Down Expand Up @@ -573,6 +573,15 @@ def test_field_descriptor(self):
self.assertRaises(AttributeError, Point.x.__set__, p, 33)
self.assertRaises(AttributeError, Point.x.__delete__, p)

class NewPoint(tuple):
x = pickle.loads(pickle.dumps(Point.x))
y = pickle.loads(pickle.dumps(Point.y))

np = NewPoint([1, 2])

self.assertEqual(np.x, 1)
self.assertEqual(np.y, 2)


################################################################################
### Abstract Base Classes
Expand Down
13 changes: 12 additions & 1 deletion Modules/_collectionsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2440,12 +2440,23 @@ tuplegetter_dealloc(_tuplegetterobject *self)
Py_TYPE(self)->tp_free((PyObject*)self);
}

static PyObject*
tuplegetter_reduce(_tuplegetterobject *self)
{
return Py_BuildValue("(O(nO))", (PyObject*) Py_TYPE(self), self->index, self->doc);
}


static PyMemberDef tuplegetter_members[] = {
{"__doc__", T_OBJECT, offsetof(_tuplegetterobject, doc), 0},
{0}
};

static PyMethodDef tuplegetter_methods[] = {
{"__reduce__", (PyCFunction) tuplegetter_reduce, METH_NOARGS, NULL},
{NULL},
};

static PyTypeObject tuplegetter_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"_collections._tuplegetter", /* tp_name */
Expand Down Expand Up @@ -2475,7 +2486,7 @@ static PyTypeObject tuplegetter_type = {
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
0, /* tp_methods */
tuplegetter_methods, /* tp_methods */
tuplegetter_members, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
Expand Down