Fix test_typing.test_unpack_wrong_type (#6009)

youknowone · web-flow · commit 3bce41baabb6 · 2025-07-21T00:54:14.000+09:00
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
@@ -5074,8 +5074,6 @@ class Child(Parent):
         gc.collect()
         self.assertEqual(Parent.__subclasses__(), [])
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_attr_raise_through_property(self):
         # test case for gh-103272
         class A:
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
@@ -1228,8 +1228,6 @@ class New[*Ts]: ...
         self.assertEqual(PartNew[Unpack[tuple[str]]].__args__, (int, str))
         self.assertEqual(PartNew[Unpack[Tuple[str]]].__args__, (int, str))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_unpack_wrong_type(self):
         Ts = TypeVarTuple("Ts")
         class Gen[*Ts]: ...
diff --git a/vm/src/types/slot.rs b/vm/src/types/slot.rs
@@ -286,7 +286,10 @@ fn getattro_wrapper(zelf: &PyObject, name: &Py<PyStr>, vm: &VirtualMachine) -> P
     let __getattr__ = identifier!(vm, __getattr__);
     match vm.call_special_method(zelf, __getattribute__, (name.to_owned(),)) {
         Ok(r) => Ok(r),
-        Err(_) if zelf.class().has_attr(__getattr__) => {
+        Err(e)
+            if e.fast_isinstance(vm.ctx.exceptions.attribute_error)
+                && zelf.class().has_attr(__getattr__) =>
+        {
             vm.call_special_method(zelf, __getattr__, (name.to_owned(),))
         }
         Err(e) => Err(e),
