From: sobolevn <mail@sobolevn.me>
Date: Thu, 12 Sep 2024 07:29:06 +0000 (+0300)
Subject: gh-123935: Fix typo in `_get_slots` in `dataclasses.py` (#123941)
X-Git-Tag: v3.14.0a1~513
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac918ccad707ab2d7dbb78a4796a7b8a874f334c;p=thirdparty%2FPython%2Fcpython.git

gh-123935: Fix typo in `_get_slots` in `dataclasses.py` (#123941)
---

diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py
index 141aa41c74d7..ac7d40cf2cac 100644
--- a/Lib/dataclasses.py
+++ b/Lib/dataclasses.py
@@ -1208,7 +1208,7 @@ def _get_slots(cls):
             slots = []
             if getattr(cls, '__weakrefoffset__', -1) != 0:
                 slots.append('__weakref__')
-            if getattr(cls, '__dictrefoffset__', -1) != 0:
+            if getattr(cls, '__dictoffset__', -1) != 0:
                 slots.append('__dict__')
             yield from slots
         case str(slot):
diff --git a/Lib/test/test_dataclasses/__init__.py b/Lib/test/test_dataclasses/__init__.py
index da696ad961cf..6934e88d9d33 100644
--- a/Lib/test/test_dataclasses/__init__.py
+++ b/Lib/test/test_dataclasses/__init__.py
@@ -3664,6 +3664,25 @@ class TestSlots(unittest.TestCase):
         self.assertEqual(A().__dict__, {})
         A()
 
+    @support.cpython_only
+    def test_dataclass_slot_dict_ctype(self):
+        # https://github.com/python/cpython/issues/123935
+        from test.support import import_helper
+        # Skips test if `_testcapi` is not present:
+        _testcapi = import_helper.import_module('_testcapi')
+
+        @dataclass(slots=True)
+        class HasDictOffset(_testcapi.HeapCTypeWithDict):
+            __dict__: dict = {}
+        self.assertNotEqual(_testcapi.HeapCTypeWithDict.__dictoffset__, 0)
+        self.assertEqual(HasDictOffset.__slots__, ())
+
+        @dataclass(slots=True)
+        class DoesNotHaveDictOffset(_testcapi.HeapCTypeWithWeakref):
+            __dict__: dict = {}
+        self.assertEqual(_testcapi.HeapCTypeWithWeakref.__dictoffset__, 0)
+        self.assertEqual(DoesNotHaveDictOffset.__slots__, ('__dict__',))
+
     @support.cpython_only
     def test_slots_with_wrong_init_subclass(self):
         # TODO: This test is for a kinda-buggy behavior.
diff --git a/Misc/NEWS.d/next/Library/2024-09-11-13-33-19.gh-issue-123935.fRZ_56.rst b/Misc/NEWS.d/next/Library/2024-09-11-13-33-19.gh-issue-123935.fRZ_56.rst
new file mode 100644
index 000000000000..de720c3714c6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-09-11-13-33-19.gh-issue-123935.fRZ_56.rst
@@ -0,0 +1,2 @@
+Fix parent slots detection for dataclasses that inherit from classes with
+``__dictoffset__``.