Fix __dict__ getset type

youknowone · youknowone · commit d56cd41d100d · 2025-07-21T00:03:05.000+09:00
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
@@ -2885,8 +2885,6 @@ def method(self) -> int: ...
 
         self.assertNotIsSubclass(NotImpl, Foo)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_pep695_generics_can_be_runtime_checkable(self):
         @runtime_checkable
         class HasX(Protocol):
@@ -3336,8 +3334,6 @@ class D(PNonCall): ...
         with self.assertRaisesRegex(TypeError, non_callable_members_illegal):
             issubclass(D, PNonCall)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_no_weird_caching_with_issubclass_after_isinstance(self):
         @runtime_checkable
         class Spam(Protocol):
@@ -3404,8 +3400,6 @@ def __getattr__(self, attr):
         ):
             issubclass(Eggs, Spam)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_no_weird_caching_with_issubclass_after_isinstance_pep695(self):
         @runtime_checkable
         class Spam[T](Protocol):
diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -1019,25 +1019,6 @@ impl Constructor for PyType {
             attributes.insert(identifier!(vm, __hash__), vm.ctx.none.clone().into());
         }
 
-        // All *classes* should have a dict. Exceptions are *instances* of
-        // classes that define __slots__ and instances of built-in classes
-        // (with exceptions, e.g function)
-        // Also, type subclasses don't need their own __dict__ descriptor
-        // since they inherit it from type
-        if !base_is_type {
-            let __dict__ = identifier!(vm, __dict__);
-            attributes.entry(__dict__).or_insert_with(|| {
-                vm.ctx
-                    .new_static_getset(
-                        "__dict__",
-                        vm.ctx.types.type_type,
-                        subtype_get_dict,
-                        subtype_set_dict,
-                    )
-                    .into()
-            });
-        }
-
         let heaptype_slots: Option<PyRef<PyTuple<PyStrRef>>> =
             if let Some(x) = attributes.get(identifier!(vm, __slots__)) {
                 let slots = if x.class().is(vm.ctx.types.str_type) {
@@ -1141,6 +1122,24 @@ impl Constructor for PyType {
             cell.set(Some(typ.clone().into()));
         };
 
+        // All *classes* should have a dict. Exceptions are *instances* of
+        // classes that define __slots__ and instances of built-in classes
+        // (with exceptions, e.g function)
+        // Also, type subclasses don't need their own __dict__ descriptor
+        // since they inherit it from type
+
+        // Add __dict__ descriptor after type creation to ensure correct __objclass__
+        if !base_is_type {
+            unsafe {
+                let descriptor =
+                    vm.ctx
+                        .new_getset("__dict__", &typ, subtype_get_dict, subtype_set_dict);
+                typ.attributes
+                    .write()
+                    .insert(identifier!(vm, __dict__), descriptor.into());
+            }
+        }
+
         // avoid deadlock
         let attributes = typ
             .attributes
