Skip to content

Commit

Permalink
pythongh-79512: Fixed names and __module__ value of weakref classes (p…
Browse files Browse the repository at this point in the history
…ythonGH-93719)

Classes ReferenceType, ProxyType and CallableProxyType have now correct
atrtributes __module__, __name__ and __qualname__.
It makes them (types, not instances) pickleable.
(cherry picked from commit 8352e32)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
  • Loading branch information
serhiy-storchaka authored and miss-islington committed Jun 14, 2022
1 parent 02ff1cc commit b0bf575
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
11 changes: 11 additions & 0 deletions Lib/test/test_weakref.py
Original file line number Diff line number Diff line change
Expand Up @@ -2154,6 +2154,17 @@ def test_atexit(self):
self.assertTrue(b'ZeroDivisionError' in err)


class ModuleTestCase(unittest.TestCase):
def test_names(self):
for name in ('ReferenceType', 'ProxyType', 'CallableProxyType',
'WeakMethod', 'WeakSet', 'WeakKeyDictionary', 'WeakValueDictionary'):
obj = getattr(weakref, name)
if name != 'WeakSet':
self.assertEqual(obj.__module__, 'weakref')
self.assertEqual(obj.__name__, name)
self.assertEqual(obj.__qualname__, name)


libreftest = """ Doctest for examples in the library reference: weakref.rst
>>> from test.support import gc_collect
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fixed names and ``__module__`` value of :mod:`weakref` classes
:class:`~weakref.ReferenceType`, :class:`~weakref.ProxyType`,
:class:`~weakref.CallableProxyType`. It makes them pickleable.
6 changes: 3 additions & 3 deletions Objects/weakrefobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ static PyMethodDef weakref_methods[] = {
PyTypeObject
_PyWeakref_RefType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "weakref",
.tp_name = "weakref.ReferenceType",
.tp_basicsize = sizeof(PyWeakReference),
.tp_dealloc = weakref_dealloc,
.tp_vectorcall_offset = offsetof(PyWeakReference, vectorcall),
Expand Down Expand Up @@ -719,7 +719,7 @@ static PyMappingMethods proxy_as_mapping = {
PyTypeObject
_PyWeakref_ProxyType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"weakproxy",
"weakref.ProxyType",
sizeof(PyWeakReference),
0,
/* methods */
Expand Down Expand Up @@ -754,7 +754,7 @@ _PyWeakref_ProxyType = {
PyTypeObject
_PyWeakref_CallableProxyType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"weakcallableproxy",
"weakref.CallableProxyType",
sizeof(PyWeakReference),
0,
/* methods */
Expand Down

0 comments on commit b0bf575

Please sign in to comment.