Merge remote-tracking branch 'upstream/main' into update-netrc

ShaharNaveh · ShaharNaveh · commit da332c873a20 · 2025-08-08T14:32:25.000+02:00
diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
@@ -197,8 +197,6 @@ def f(o):
             with self.assertRaises(TypeError):
                 f(o)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_store_shadowing_slot_should_raise_type_error(self):
         class Class:
             __slots__ = ("slot",)
diff --git a/vm/src/builtins/descriptor.rs b/vm/src/builtins/descriptor.rs
@@ -274,6 +274,16 @@ impl PyMemberDescriptor {
         vm: &VirtualMachine,
     ) -> PyResult<()> {
         let zelf = Self::_as_pyref(zelf, vm)?;
+
+        if !obj.class().fast_issubclass(&zelf.common.typ) {
+            return Err(vm.new_type_error(format!(
+                "descriptor '{}' for '{}' objects doesn't apply to a '{}' object",
+                zelf.common.name,
+                zelf.common.typ.name(),
+                obj.class().name()
+            )));
+        }
+
         zelf.member.set(obj, value, vm)
     }
 }
