NotificationsYou must be signed in to change notification settings
Fork33.3k
Star69.7k

Commitd97757f

authored

gh-102069: Fix__weakref__ descriptor generation for custom dataclasses (#102075)

1 parent71e37d9 commitd97757fCopy full SHA for d97757f

File tree

3 files changed

+15

-4

lines changed

Lib
- dataclasses.py
- test
  - test_dataclasses.py
Misc/NEWS.d/next/Library
- 2023-02-20-16-47-56.gh-issue-102069.FS7f1j.rst

3 files changed

+15

-4

lines changed

`‎Lib/dataclasses.py‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1189,6 +1189,9 @@ def _add_slots(cls, is_frozen, weakref_slot):`
`1189`	`1189`	`# Remove __dict__ itself.`
`1190`	`1190`	`cls_dict.pop('__dict__',None)`
`1191`	`1191`
	`1192`	+# Clear existing `__weakref__` descriptor, it belongs to a previous type:
	`1193`	`+cls_dict.pop('__weakref__',None)# gh-102069`
	`1194`	`+`
`1192`	`1195`	`# And finally create the class.`
`1193`	`1196`	`qualname=getattr(cls,'__qualname__',None)`
`1194`	`1197`	`cls=type(cls)(cls.__name__,cls.__bases__,cls_dict)`

`‎Lib/test/test_dataclasses.py‎`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3175,6 +3175,8 @@ class A:`
`3175`	`3175`	`withself.assertRaisesRegex(TypeError,`
`3176`	`3176`	`"cannot create weak reference"):`
`3177`	`3177`	`weakref.ref(a)`
	`3178`	`+withself.assertRaises(AttributeError):`
	`3179`	`+a.__weakref__`
`3178`	`3180`
`3179`	`3181`	`deftest_slots_weakref(self):`
`3180`	`3182`	`@dataclass(slots=True,weakref_slot=True)`
`@@ -3183,7 +3185,9 @@ class A:`
`3183`	`3185`
`3184`	`3186`	`self.assertIn("__weakref__",A.__slots__)`
`3185`	`3187`	`a=A(1)`
`3186`		`-weakref.ref(a)`
	`3188`	`+a_ref=weakref.ref(a)`
	`3189`	`+`
	`3190`	`+self.assertIs(a.__weakref__,a_ref)`
`3187`	`3191`
`3188`	`3192`	`deftest_slots_weakref_base_str(self):`
`3189`	`3193`	`classBase:`
`@@ -3249,7 +3253,8 @@ class A(Base):`
`3249`	`3253`	`self.assertIn("__weakref__",Base.__slots__)`
`3250`	`3254`	`self.assertNotIn("__weakref__",A.__slots__)`
`3251`	`3255`	`a=A(1)`
`3252`		`-weakref.ref(a)`
	`3256`	`+a_ref=weakref.ref(a)`
	`3257`	`+self.assertIs(a.__weakref__,a_ref)`
`3253`	`3258`
`3254`	`3259`	`deftest_weakref_slot_subclass_no_weakref_slot(self):`
`3255`	`3260`	`@dataclass(slots=True,weakref_slot=True)`
`@@ -3265,7 +3270,8 @@ class A(Base):`
`3265`	`3270`	`self.assertIn("__weakref__",Base.__slots__)`
`3266`	`3271`	`self.assertNotIn("__weakref__",A.__slots__)`
`3267`	`3272`	`a=A(1)`
`3268`		`-weakref.ref(a)`
	`3273`	`+a_ref=weakref.ref(a)`
	`3274`	`+self.assertIs(a.__weakref__,a_ref)`
`3269`	`3275`
`3270`	`3276`	`deftest_weakref_slot_normal_base_weakref_slot(self):`
`3271`	`3277`	`classBase:`
`@@ -3280,7 +3286,8 @@ class A(Base):`
`3280`	`3286`	`self.assertIn("__weakref__",Base.__slots__)`
`3281`	`3287`	`self.assertNotIn("__weakref__",A.__slots__)`
`3282`	`3288`	`a=A(1)`
`3283`		`-weakref.ref(a)`
	`3289`	`+a_ref=weakref.ref(a)`
	`3290`	`+self.assertIs(a.__weakref__,a_ref)`
`3284`	`3291`
`3285`	`3292`
`3286`	`3293`	`classTestDescriptors(unittest.TestCase):`

`‎Misc/NEWS.d/next/Library/2023-02-20-16-47-56.gh-issue-102069.FS7f1j.rst‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix ``__weakref__`` descriptor generation for custom dataclasses.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitd97757f

File tree

3 files changed

3 files changed

`‎Lib/dataclasses.py‎`

`‎Lib/test/test_dataclasses.py‎`

`‎Misc/NEWS.d/next/Library/2023-02-20-16-47-56.gh-issue-102069.FS7f1j.rst‎`

0 commit comments