Merge main to resolve functools regression test import conflict

Author: xiehuanyi

requirements-tests.txt

@@ -3,7 +3,7 @@
 mypy==2.4.0
 pyrefly==1.3.2
 pyright==1.1.414
-ty==0.0.84
+ty==0.0.85
 
 # Libraries used by our various scripts.
 aiohttp==3.14.3

stdlib/@tests/test_cases/asyncio/check_gather.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Awaitable, List, Tuple, Union
+from collections.abc import Awaitable
 from typing_extensions import assert_type
 
 
@@ -15,20 +15,20 @@ async def coro2() -> str:
 
 async def test_gather(awaitable1: Awaitable[int], awaitable2: Awaitable[str]) -> None:
     a = await asyncio.gather(awaitable1)
-    assert_type(a, Tuple[int])
+    assert_type(a, tuple[int])
 
     b = await asyncio.gather(awaitable1, awaitable2, return_exceptions=True)
-    assert_type(b, Tuple[Union[int, BaseException], Union[str, BaseException]])
+    assert_type(b, tuple[int | BaseException, str | BaseException])
 
     c = await asyncio.gather(awaitable1, awaitable2, awaitable1, awaitable1, awaitable1, awaitable1)
-    assert_type(c, Tuple[int, str, int, int, int, int])
+    assert_type(c, tuple[int, str, int, int, int, int])
 
     d = await asyncio.gather(awaitable1, awaitable1, awaitable1, awaitable1, awaitable1, awaitable1, awaitable1)
-    assert_type(d, List[int])
+    assert_type(d, list[int])
 
     awaitables_list: list[Awaitable[int]] = [awaitable1]
     e = await asyncio.gather(*awaitables_list)
-    assert_type(e, List[int])
+    assert_type(e, list[int])
 
     # this case isn't reliable between typecheckers, no one would ever call it with no args anyway
     # f = await asyncio.gather()

stdlib/@tests/test_cases/builtins/check_dict.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import os
-from typing import Any, Dict, Generic, Iterable, Mapping, TypeVar, Union
+from collections.abc import Iterable, Mapping
+from typing import Any, Generic, TypeVar
 from typing_extensions import Self, assert_type
 
 ###################################################################
@@ -15,9 +16,9 @@
 # https://github.com/python/mypy/issues/12358
 # bad = dict()
 good: dict[str, str] = dict()
-assert_type(good, Dict[str, str])
+assert_type(good, dict[str, str])
 
-assert_type(dict(arg=1), Dict[str, int])
+assert_type(dict(arg=1), dict[str, int])
 
 _KT = TypeVar("_KT")
 _VT = TypeVar("_VT")
@@ -37,11 +38,11 @@ def __getitem__(self, __k: _KT) -> _VT:
 
 
 kt1: KeysAndGetItem[int, str] = KeysAndGetItem({0: ""})
-assert_type(dict(kt1), Dict[int, str])
+assert_type(dict(kt1), dict[int, str])
 dict(kt1, arg="a")  # type: ignore
 
 kt2: KeysAndGetItem[str, int] = KeysAndGetItem({"": 0})
-assert_type(dict(kt2, arg=1), Dict[str, int])
+assert_type(dict(kt2, arg=1), dict[str, int])
 
 
 def test_iterable_tuple_overload(x: Iterable[tuple[int, str]]) -> dict[int, str]:
@@ -53,12 +54,12 @@ def test_iterable_tuple_overload(x: Iterable[tuple[int, str]]) -> dict[int, str]
 dict(i1, arg="a")  # type: ignore
 
 i2: Iterable[tuple[str, int]] = [("a", 1), ("b", 2)]
-assert_type(dict(i2, arg=1), Dict[str, int])
+assert_type(dict(i2, arg=1), dict[str, int])
 
 i3: Iterable[str] = ["a.b"]
 i4: Iterable[bytes] = [b"a.b"]
-assert_type(dict(string.split(".") for string in i3), Dict[str, str])
-assert_type(dict(string.split(b".") for string in i4), Dict[bytes, bytes])
+assert_type(dict(string.split(".") for string in i3), dict[str, str])
+assert_type(dict(string.split(b".") for string in i4), dict[bytes, bytes])
 
 dict(["foo", "bar", "baz"])  # type: ignore
 dict([b"foo", b"bar", b"baz"])  # type: ignore
@@ -71,19 +72,19 @@ def test_iterable_tuple_overload(x: Iterable[tuple[int, str]]) -> dict[int, str]
 int_value = 1
 
 assert_type(d_any["key"], Any)
-assert_type(d_any.get("key"), Union[Any, None])
-assert_type(d_any.get("key", None), Union[Any, None])
+assert_type(d_any.get("key"), Any | None)
+assert_type(d_any.get("key", None), Any | None)
 assert_type(d_any.get("key", any_value), Any)
 assert_type(d_any.get("key", str_value), Any)
 assert_type(d_any.get("key", int_value), Any)
 
 assert_type(d_str["key"], str)
-assert_type(d_str.get("key"), Union[str, None])
-assert_type(d_str.get("key", None), Union[str, None])
+assert_type(d_str.get("key"), str | None)
+assert_type(d_str.get("key", None), str | None)
 # Pyright has str instead of Any here
 assert_type(d_str.get("key", any_value), Any)  # pyright: ignore[reportAssertTypeFailure]
 assert_type(d_str.get("key", str_value), str)
-assert_type(d_str.get("key", int_value), Union[str, int])
+assert_type(d_str.get("key", int_value), str | int)
 
 # Now with context!
 result: str
@@ -184,16 +185,16 @@ def test_dict_dot_or(
     assert_type(a | b, dict[int, int])
     assert_type(b | a, dict[int, int])
 
-    assert_type(a | c, dict[Union[int, str], Union[int, str]])
+    assert_type(a | c, dict[int | str, int | str])
 
     # arbitrary mappings are not accepted by `dict.__or__`;
     # it has to be a subclass of `dict`
     a | d  # type: ignore
 
     # but Mappings such as `os._Environ` or `CustomMappingWithDunderOr`,
     # which define `__ror__` methods that accept `dict`, are fine:
-    assert_type(a | os.environ, dict[Union[str, int], Union[str, int]])
-    assert_type(os.environ | a, dict[Union[str, int], Union[str, int]])
+    assert_type(a | os.environ, dict[int | str, int | str])
+    assert_type(os.environ | a, dict[int | str, int | str])
 
     assert_type(c | os.environ, dict[str, str])
     assert_type(c | e, dict[str, str])

stdlib/@tests/test_cases/builtins/check_list.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from typing import List, Union
 from typing_extensions import assert_type
 
 
@@ -16,6 +15,6 @@ def asd(self) -> int:
 
 
 combined = [Foo()] + [Bar()]
-assert_type(combined, List[Union[Foo, Bar]])
+assert_type(combined, list[Foo | Bar])
 for item in combined:
     assert_type(item.asd(), int)

stdlib/@tests/test_cases/builtins/check_sum.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, List, Literal, Union
+from typing import Any, Literal
 from typing_extensions import assert_type
 
 
@@ -31,10 +31,10 @@ def __radd__(self, other: Any) -> Baz:
 assert_type(sum([True, False], True), int)
 assert_type(sum(literal_list), int)
 
-assert_type(sum([["foo"], ["bar"]], ["baz"]), List[str])
+assert_type(sum([["foo"], ["bar"]], ["baz"]), list[str])
 
 assert_type(sum([Foo(), Foo()], Foo()), Foo)
-assert_type(sum([Baz(), Baz()]), Union[Baz, Literal[0]])
+assert_type(sum([Baz(), Baz()]), Baz | Literal[0])
 
 # mypy and pyright infer the types differently for these, so we can't use assert_type
 # Just test that no error is emitted for any of these

stdlib/@tests/test_cases/builtins/check_tuple.py

@@ -1,13 +1,27 @@
 from __future__ import annotations
 
-from typing import Tuple
+import sys
+from typing import Any
 from typing_extensions import assert_type
 
 
 # Empty tuples, see #8275
-class TupleSub(Tuple[int, ...]):
+class TupleSub(tuple[int, ...]):
     pass
 
 
 assert_type(TupleSub(), TupleSub)
 assert_type(TupleSub([1, 2, 3]), TupleSub)
+
+# Hashability shenanigans, see #15852
+t: tuple[int, int] = (1, 3)
+hash(t)
+u: tuple[int, ...] = tuple(b"spam")
+hash(u)
+v: tuple[str] = ("",)
+hash(v)
+w: tuple[()] = ()
+hash(w)
+hash(tuple(sys.platform))
+x: tuple[Any, Any] = ((), ())
+hash(x)

stdlib/@tests/test_cases/builtins/check_zip.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
-from typing import Sequence, Tuple
+from collections.abc import Sequence
 from typing_extensions import assert_type
 
 ints: Sequence[int] = [1, 2, 3]
 strs: Sequence[str] = ["one", "two", "three"]
 floats: Sequence[float] = [1.0, 2.0, 3.0]
-str_tuples: Sequence[Tuple[str]] = list((x,) for x in strs)
+str_tuples: Sequence[tuple[str]] = list((x,) for x in strs)
 
-assert_type(zip(ints), zip[Tuple[int]])
-assert_type(zip(ints, strs), zip[Tuple[int, str]])
-assert_type(zip(ints, strs, floats), zip[Tuple[int, str, float]])
-assert_type(zip(strs, ints, floats, ints), zip[Tuple[str, int, float, int]])
-assert_type(zip(strs, ints, floats, ints, str_tuples), zip[Tuple[str, int, float, int, Tuple[str]]])
+assert_type(zip(ints), zip[tuple[int]])
+assert_type(zip(ints, strs), zip[tuple[int, str]])
+assert_type(zip(ints, strs, floats), zip[tuple[int, str, float]])
+assert_type(zip(strs, ints, floats, ints), zip[tuple[str, int, float, int]])
+assert_type(zip(strs, ints, floats, ints, str_tuples), zip[tuple[str, int, float, int, tuple[str]]])

stdlib/@tests/test_cases/check_dataclasses.py

@@ -2,7 +2,7 @@
 
 import dataclasses as dc
 import sys
-from typing import TYPE_CHECKING, Any, Dict, FrozenSet, Tuple, Type, Union
+from typing import TYPE_CHECKING, Any
 from typing_extensions import Annotated, assert_type
 
 if TYPE_CHECKING:
@@ -14,21 +14,21 @@ class Foo:
     attr: str
 
 
-assert_type(dc.fields(Foo), Tuple[dc.Field[Any], ...])
+assert_type(dc.fields(Foo), tuple[dc.Field[Any], ...])
 
 dc.asdict(Foo)  # type: ignore
 dc.astuple(Foo)  # type: ignore
 dc.replace(Foo)  # type: ignore
 
 # See #9723 for why we can't make this assertion
 # if dc.is_dataclass(Foo):
-#     assert_type(Foo, Type[Foo])
+#     assert_type(Foo, type[Foo])
 
 f = Foo(attr="attr")
 
-assert_type(dc.fields(f), Tuple[dc.Field[Any], ...])
-assert_type(dc.asdict(f), Dict[str, Any])
-assert_type(dc.astuple(f), Tuple[Any, ...])
+assert_type(dc.fields(f), tuple[dc.Field[Any], ...])
+assert_type(dc.asdict(f), dict[str, Any])
+assert_type(dc.astuple(f), tuple[Any, ...])
 assert_type(dc.replace(f, attr="new"), Foo)
 
 if dc.is_dataclass(f):
@@ -39,17 +39,17 @@ class Foo:
 
 def is_dataclass_any(arg: Any) -> None:
     if dc.is_dataclass(arg):
-        assert_type(arg, Union["DataclassInstance", Type["DataclassInstance"]])
+        assert_type(arg, DataclassInstance | type[DataclassInstance])
 
 
 def is_dataclass_object(arg: object) -> None:
     if dc.is_dataclass(arg):
-        assert_type(arg, Union["DataclassInstance", Type["DataclassInstance"]])
+        assert_type(arg, DataclassInstance | type[DataclassInstance])
 
 
 def is_dataclass_type(arg: type) -> None:
     if dc.is_dataclass(arg):
-        assert_type(arg, Type["DataclassInstance"])
+        assert_type(arg, type[DataclassInstance])
 
 
 def check_other_isdataclass_overloads(x: type, y: object) -> None:
@@ -68,26 +68,26 @@ def check_other_isdataclass_overloads(x: type, y: object) -> None:
     dc.replace(y)  # type: ignore
 
     if dc.is_dataclass(x):
-        assert_type(x, Type["DataclassInstance"])
-        assert_type(dc.fields(x), Tuple[dc.Field[Any], ...])
+        assert_type(x, type[DataclassInstance])
+        assert_type(dc.fields(x), tuple[dc.Field[Any], ...])
 
         dc.asdict(x)  # type: ignore
         dc.astuple(x)  # type: ignore
         dc.replace(x)  # type: ignore
 
     if dc.is_dataclass(y):
-        assert_type(y, Union["DataclassInstance", Type["DataclassInstance"]])
-        assert_type(dc.fields(y), Tuple[dc.Field[Any], ...])
+        assert_type(y, DataclassInstance | type[DataclassInstance])
+        assert_type(dc.fields(y), tuple[dc.Field[Any], ...])
 
         dc.asdict(y)  # type: ignore
         dc.astuple(y)  # type: ignore
         dc.replace(y)  # type: ignore
 
     if dc.is_dataclass(y) and not isinstance(y, type):
-        assert_type(y, "DataclassInstance")
-        assert_type(dc.fields(y), Tuple[dc.Field[Any], ...])
-        assert_type(dc.asdict(y), Dict[str, Any])
-        assert_type(dc.astuple(y), Tuple[Any, ...])
+        assert_type(y, DataclassInstance)
+        assert_type(dc.fields(y), tuple[dc.Field[Any], ...])
+        assert_type(dc.asdict(y), dict[str, Any])
+        assert_type(dc.astuple(y), tuple[Any, ...])
         dc.replace(y)
 
 
@@ -103,13 +103,13 @@ class _D: ...
 
 # Regression test for #11653
 D = dc.make_dataclass(
-    "D", [("a", Union[int, None]), "y", ("z", Annotated[FrozenSet[bytes], "metadata"], dc.field(default=frozenset({b"foo"})))]
+    "D", [("a", int | None), "y", ("z", Annotated[frozenset[bytes], "metadata"], dc.field(default=frozenset({b"foo"})))]
 )
 # Check that it's inferred by the type checker as a class object of some kind
 # (but don't assert the exact type that `D` is inferred as,
 # in case a type checker decides to add some special-casing for
 # `make_dataclass` in the future)
-assert_type(D.__mro__, Tuple[type, ...])
+assert_type(D.__mro__, tuple[type, ...])
 
 
 if sys.version_info >= (3, 14):
@@ -148,6 +148,6 @@ def custom_dataclass(
 
     dc.make_dataclass(
         "D",
-        [("a", Union[int, None]), "y", ("z", Annotated[FrozenSet[bytes], "metadata"], dc.field(default=frozenset({b"foo"})))],
+        [("a", int | None), "y", ("z", Annotated[frozenset[bytes], "metadata"], dc.field(default=frozenset({b"foo"})))],
         decorator=custom_dataclass,
     )