Fix getset.__objclass__ (#5853)

youknowone · web-flow · commit ac26be7fd726 · 2025-06-28T00:35:05.000+09:00
diff --git a/vm/src/builtins/getset.rs b/vm/src/builtins/getset.rs
@@ -1,7 +1,7 @@
 /*! Python `attribute` descriptor class. (PyGetSet)
 
 */
-use super::{PyType, PyTypeRef};
+use super::PyType;
 use crate::{
     AsObject, Context, Py, PyObject, PyObjectRef, PyPayload, PyResult, VirtualMachine,
     class::PyClassImpl,
@@ -141,9 +141,10 @@ impl PyGetSet {
         format!("{}.{}", self.class.slot_name(), self.name.clone())
     }
 
-    #[pygetset]
-    fn __objclass__(&self) -> PyTypeRef {
-        self.class.to_owned()
+    #[pymember]
+    fn __objclass__(vm: &VirtualMachine, zelf: PyObjectRef) -> PyResult {
+        let zelf: &Py<Self> = zelf.try_to_value(vm)?;
+        Ok(zelf.class.to_owned().into())
     }
 }
 impl Unconstructible for PyGetSet {}
diff --git a/vm/src/builtins/type.rs b/vm/src/builtins/type.rs
@@ -910,7 +910,7 @@ impl Constructor for PyType {
             vm.ctx
                 .new_getset(
                     "__dict__",
-                    vm.ctx.types.object_type,
+                    vm.ctx.types.type_type,
                     subtype_get_dict,
                     subtype_set_dict,
                 )
