mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.11] gh-102069: Fix __weakref__ descriptor generation for custom dataclasses (GH-102075) (#102662)

Browse source 
gh-102069: Fix `__weakref__` descriptor generation for custom dataclasses (GH-102075)
(cherry picked from commit d97757f793)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
This commit is contained in:
Miss Islington (bot) 2023-03-13 15:17:46 -07:00 • committed by GitHub
parent a4fcd06c50
commit b0e221cfc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/dataclasses.py
View file

@ -1175,6 +1175,9 @@ def _add_slots(cls, is_frozen, weakref_slot):
# Remove __dict__ itself.
cls_dict.pop('__dict__', None)
# Clear existing `__weakref__` descriptor, it belongs to a previous type:
cls_dict.pop('__weakref__', None) # gh-102069
# And finally create the class.
qualname = getattr(cls, '__qualname__', None)
cls = type(cls)(cls.__name__, cls.__bases__, cls_dict)

15
Lib/test/test_dataclasses.py
View file

@ -3076,6 +3076,8 @@ class TestSlots(unittest.TestCase):
with self.assertRaisesRegex(TypeError,
"cannot create weak reference"):
weakref.ref(a)
with self.assertRaises(AttributeError):
a.__weakref__
def test_slots_weakref(self):
@dataclass(slots=True, weakref_slot=True)
@ -3084,7 +3086,9 @@ class TestSlots(unittest.TestCase):
self.assertIn("__weakref__", A.__slots__)
a = A(1)
weakref.ref(a)
a_ref = weakref.ref(a)
self.assertIs(a.__weakref__, a_ref)
def test_slots_weakref_base_str(self):
class Base:
@ -3150,7 +3154,8 @@ class TestSlots(unittest.TestCase):
self.assertIn("__weakref__", Base.__slots__)
self.assertNotIn("__weakref__", A.__slots__)
a = A(1)
weakref.ref(a)
a_ref = weakref.ref(a)
self.assertIs(a.__weakref__, a_ref)
def test_weakref_slot_subclass_no_weakref_slot(self):
@dataclass(slots=True, weakref_slot=True)
@ -3166,7 +3171,8 @@ class TestSlots(unittest.TestCase):
self.assertIn("__weakref__", Base.__slots__)
self.assertNotIn("__weakref__", A.__slots__)
a = A(1)
weakref.ref(a)
a_ref = weakref.ref(a)
self.assertIs(a.__weakref__, a_ref)
def test_weakref_slot_normal_base_weakref_slot(self):
class Base:
@ -3181,7 +3187,8 @@ class TestSlots(unittest.TestCase):
self.assertIn("__weakref__", Base.__slots__)
self.assertNotIn("__weakref__", A.__slots__)
a = A(1)
weakref.ref(a)
a_ref = weakref.ref(a)
self.assertIs(a.__weakref__, a_ref)
class TestDescriptors(unittest.TestCase):

1
Misc/NEWS.d/next/Library/2023-02-20-16-47-56.gh-issue-102069.FS7f1j.rst Normal file
View file

@ -0,0 +1 @@
Fix ``__weakref__`` descriptor generation for custom dataclasses.