|
103 | 103 | runtime_checkable, |
104 | 104 | ) |
105 | 105 |
|
| 106 | +if sys.version_info >= (3, 14): |
| 107 | + from test.support import EqualToForwardRef |
| 108 | +else: |
| 109 | + EqualToForwardRef = typing.ForwardRef |
| 110 | + |
106 | 111 | NoneType = type(None) |
107 | 112 | T = TypeVar("T") |
108 | 113 | KT = TypeVar("KT") |
@@ -5164,7 +5169,6 @@ class Y(TypedDict): |
5164 | 5169 | b: "int" |
5165 | 5170 | if sys.version_info >= (3, 14): |
5166 | 5171 | import annotationlib |
5167 | | - from test.support import EqualToForwardRef |
5168 | 5172 |
|
5169 | 5173 | fwdref = EqualToForwardRef('int', module=__name__) |
5170 | 5174 | self.assertEqual(Y.__annotations__, {'a': type(None), 'b': fwdref}) |
@@ -6022,7 +6026,7 @@ def test_substitution(self): |
6022 | 6026 | U2 = Unpack[Ts] |
6023 | 6027 | self.assertEqual(C2[U1], (str, int, str)) |
6024 | 6028 | self.assertEqual(C2[U2], (str, Unpack[Ts])) |
6025 | | - self.assertEqual(C2["U2"], (str, typing.ForwardRef("U2"))) |
| 6029 | + self.assertEqual(C2["U2"], (str, EqualToForwardRef("U2"))) |
6026 | 6030 |
|
6027 | 6031 | if (3, 12, 0) <= sys.version_info < (3, 12, 4): |
6028 | 6032 | with self.assertRaises(AssertionError): |
@@ -7309,8 +7313,8 @@ def test_or(self): |
7309 | 7313 | self.assertEqual(X | "x", Union[X, "x"]) |
7310 | 7314 | self.assertEqual("x" | X, Union["x", X]) |
7311 | 7315 | # make sure the order is correct |
7312 | | - self.assertEqual(get_args(X | "x"), (X, typing.ForwardRef("x"))) |
7313 | | - self.assertEqual(get_args("x" | X), (typing.ForwardRef("x"), X)) |
| 7316 | + self.assertEqual(get_args(X | "x"), (X, EqualToForwardRef("x"))) |
| 7317 | + self.assertEqual(get_args("x" | X), (EqualToForwardRef("x"), X)) |
7314 | 7318 |
|
7315 | 7319 | def test_union_constrained(self): |
7316 | 7320 | A = TypeVar('A', str, bytes) |
@@ -8878,7 +8882,7 @@ class X: |
8878 | 8882 | type_params=None, |
8879 | 8883 | format=Format.FORWARDREF, |
8880 | 8884 | ) |
8881 | | - self.assertEqual(evaluated_ref, typing.ForwardRef("doesnotexist2")) |
| 8885 | + self.assertEqual(evaluated_ref, EqualToForwardRef("doesnotexist2")) |
8882 | 8886 |
|
8883 | 8887 | def test_evaluate_with_type_params(self): |
8884 | 8888 | # Use a T name that is not in globals |
|
0 commit comments