Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
gh-95196: Disable incorrect pickling of the C implemented classmethod…
… descriptors
  • Loading branch information
serhiy-storchaka committed Aug 29, 2022
commit abe2e5a2afb7c32065276833ca84210e47499280
21 changes: 20 additions & 1 deletion Lib/test/pickletester.py
Original file line number Diff line number Diff line change
Expand Up @@ -2776,6 +2776,15 @@ def pie(self):
unpickled = self.loads(self.dumps(method, proto))
self.assertEqual(method(obj), unpickled(obj))

descriptors = (
PyMethodsTest.__dict__['cheese'],
PyMethodsTest.__dict__['wine'],
)
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
for descr in descriptors:
with self.subTest(proto=proto, descr=descr):
self.assertRaises(TypeError, self.dumps, descr, proto)

def test_c_methods(self):
global Subclass
class Subclass(tuple):
Expand Down Expand Up @@ -2805,12 +2814,22 @@ class Nested(str):
(Subclass.Nested("sweet").count, ("e",)),
(Subclass.Nested.count, (Subclass.Nested("sweet"), "e")),
)
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
#for proto in range(pickle.HIGHEST_PROTOCOL + 1):
for proto in [5]:
for method, args in c_methods:
with self.subTest(proto=proto, method=method):
unpickled = self.loads(self.dumps(method, proto))
self.assertEqual(method(*args), unpickled(*args))

descriptors = (
bytearray.__dict__['maketrans'],
dict.__dict__['fromkeys'],
)
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
for descr in descriptors:
with self.subTest(proto=proto, descr=descr):
self.assertRaises(TypeError, self.dumps, descr, proto)

def test_compat_pickle(self):
tests = [
(range(1, 7), '__builtin__', 'xrange'),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Disable incorrect pickling of the C implemented classmethod descriptors.
2 changes: 1 addition & 1 deletion Objects/descrobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ PyTypeObject PyClassMethodDescr_Type = {
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
descr_methods, /* tp_methods */
0, /* tp_methods */
descr_members, /* tp_members */
method_getset, /* tp_getset */
0, /* tp_base */
Expand Down