RustPython · youknowone · Jul 7, 2025 · Jul 3, 2025 · Jul 7, 2025 · Jul 7, 2025
diff --git a/Lib/test/_typed_dict_helper.py b/Lib/test/_typed_dict_helper.py
diff --git a/Lib/test/ann_module.py b/Lib/test/ann_module.py
diff --git a/Lib/test/ann_module2.py b/Lib/test/ann_module2.py
diff --git a/Lib/test/ann_module3.py b/Lib/test/ann_module3.py
diff --git a/Lib/test/ann_module4.py b/Lib/test/ann_module4.py
diff --git a/Lib/test/ann_module5.py b/Lib/test/ann_module5.py
diff --git a/Lib/test/ann_module6.py b/Lib/test/ann_module6.py
diff --git a/Lib/test/ann_module7.py b/Lib/test/ann_module7.py
diff --git a/Lib/test/mod_generics_cache.py b/Lib/test/mod_generics_cache.py
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
@@ -400,7 +400,7 @@ def test_var_annot_module_semantics(self):
     def test_var_annot_in_module(self):
         # check that functions fail the same way when executed
         # outside of module where they were defined
-        from test.ann_module3 import f_bad_ann, g_bad_ann, D_bad_ann
+        from test.typinganndata.ann_module3 import f_bad_ann, g_bad_ann, D_bad_ann
         with self.assertRaises(NameError):
             f_bad_ann()
         with self.assertRaises(NameError):

diff --git a/Lib/test/test_module/__init__.py b/Lib/test/test_module/__init__.py
@@ -334,7 +334,7 @@ def test_annotations_getset_raises(self):
             del foo.__annotations__
 
     def test_annotations_are_created_correctly(self):
-        ann_module4 = import_helper.import_fresh_module('test.ann_module4')
+        ann_module4 = import_helper.import_fresh_module('test.typinganndata.ann_module4')
         self.assertTrue("__annotations__" in ann_module4.__dict__)
         del ann_module4.__annotations__
         self.assertFalse("__annotations__" in ann_module4.__dict__)

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
@@ -629,8 +629,6 @@ def test_typevar(self):
         class A(Generic[T]): ...
         Alias = Optional[T]
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_typevar_none(self):
         U = TypeVar('U')
         U_None = TypeVar('U_None', default=None)
@@ -1210,8 +1208,6 @@ def foo(**kwargs: Unpack[Movie]): ...
         self.assertEqual(repr(foo.__annotations__['kwargs']),
                          f"typing.Unpack[{__name__}.Movie]")
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_builtin_tuple(self):
         Ts = TypeVarTuple("Ts")
 
@@ -2636,11 +2632,6 @@ def test_consistency(self):
 class CollectionsCallableTests(BaseCallableTests, BaseTestCase):
     Callable = collections.abc.Callable
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
-    def test_errors(self):
-        super().test_errors()
-
 
 class LiteralTests(BaseTestCase):
     def test_basics(self):
@@ -3608,8 +3599,6 @@ class C(B[int]):
         c.bar = 'abc'
         self.assertEqual(c.__dict__, {'bar': 'abc'})
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_setattr_exceptions(self):
         class Immutable[T]:
             def __setattr__(self, key, value):
@@ -3753,8 +3742,6 @@ class Meta(type): ...
         self.assertEqual(Union[T, int][Meta], Union[Meta, int])
         self.assertEqual(Callable[..., Meta].__args__, (Ellipsis, Meta))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_generic_hashes(self):
         class A(Generic[T]):
             ...
@@ -4302,8 +4289,6 @@ class B(Generic[T]):
         self.assertEqual(A[T], A[T])
         self.assertNotEqual(A[T], B[T])
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_multiple_inheritance(self):
 
         class A(Generic[T, VT]):
@@ -6106,8 +6091,6 @@ class C(Generic[T]): pass
         self.assertIs(get_origin((*tuple[*Ts],)[0]), tuple)
         self.assertIs(get_origin(Unpack[Tuple[Unpack[Ts]]]), Unpack)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_get_args(self):
         T = TypeVar('T')
         class C(Generic[T]): pass
@@ -7599,8 +7582,6 @@ class A[T](TypedDict):
         self.assertEqual(A[str].__parameters__, ())
         self.assertEqual(A[str].__args__, (str,))
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_generic_inheritance(self):
         class A(TypedDict, Generic[T]):
             a: T

diff --git a/Lib/test/typinganndata/mod_generics_cache.py b/Lib/test/typinganndata/mod_generics_cache.py
@@ -2,25 +2,23 @@
 
 from typing import TypeVar, Generic, Optional, TypeAliasType
 
-# TODO: RUSTPYTHON
+default_a: Optional['A'] = None
+default_b: Optional['B'] = None
 
-# default_a: Optional['A'] = None
-# default_b: Optional['B'] = None
+T = TypeVar('T')
 
-# T = TypeVar('T')
 
+class A(Generic[T]):
+    some_b: 'B'
 
-# class A(Generic[T]):
-#     some_b: 'B'
 
+class B(Generic[T]):
+    class A(Generic[T]):
+        pass
 
-# class B(Generic[T]):
-#     class A(Generic[T]):
-#         pass
+    my_inner_a1: 'B.A'
+    my_inner_a2: A
+    my_outer_a: 'A'  # unless somebody calls get_type_hints with localns=B.__dict__
 
-#     my_inner_a1: 'B.A'
-#     my_inner_a2: A
-#     my_outer_a: 'A'  # unless somebody calls get_type_hints with localns=B.__dict__
-
-# type Alias = int
-# OldStyle = TypeAliasType("OldStyle", int)
+type Alias = int
+OldStyle = TypeAliasType("OldStyle", int)