From 8310f35207312a40ecc51bdf812fe3fd81afc166 Mon Sep 17 00:00:00 2001
From: Brian Schubert <brianm.schubert@gmail.com>
Date: Wed, 2 Apr 2025 09:52:00 -0400
Subject: [PATCH] Drop Python 3.8 support in typeshed utilities

---
 lib/ts_utils/metadata.py        | 4 ++--
 lib/ts_utils/utils.py           | 6 +++---
 scripts/sync_protobuf/_utils.py | 3 ++-
 tests/mypy_test.py              | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/ts_utils/metadata.py b/lib/ts_utils/metadata.py
index 33948bdb8b36..40bc42354089 100644
--- a/lib/ts_utils/metadata.py
+++ b/lib/ts_utils/metadata.py
@@ -10,8 +10,8 @@
 from collections.abc import Mapping
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Final, NamedTuple, final
-from typing_extensions import Annotated, TypeGuard
+from typing import Annotated, Final, NamedTuple, final
+from typing_extensions import TypeGuard
 
 import tomli
 import tomlkit
diff --git a/lib/ts_utils/utils.py b/lib/ts_utils/utils.py
index 667b47c6fabd..50b18df69766 100644
--- a/lib/ts_utils/utils.py
+++ b/lib/ts_utils/utils.py
@@ -7,7 +7,7 @@
 from collections.abc import Iterable, Mapping
 from functools import lru_cache
 from pathlib import Path
-from typing import Any, Dict, Final, NamedTuple, Tuple
+from typing import Any, Final, NamedTuple
 from typing_extensions import TypeAlias
 
 import pathspec
@@ -111,8 +111,8 @@ def get_mypy_req() -> str:
 # Parsing the stdlib/VERSIONS file
 # ====================================================================
 
-VersionTuple: TypeAlias = Tuple[int, int]
-SupportedVersionsDict: TypeAlias = Dict[str, Tuple[VersionTuple, VersionTuple]]
+VersionTuple: TypeAlias = tuple[int, int]
+SupportedVersionsDict: TypeAlias = dict[str, tuple[VersionTuple, VersionTuple]]
 
 VERSIONS_PATH = STDLIB_PATH / "VERSIONS"
 VERSION_LINE_RE = re.compile(r"^([a-zA-Z_][a-zA-Z0-9_.]*): ([23]\.\d{1,2})-([23]\.\d{1,2})?$")
diff --git a/scripts/sync_protobuf/_utils.py b/scripts/sync_protobuf/_utils.py
index cb82ba1709a0..2cab826f571a 100644
--- a/scripts/sync_protobuf/_utils.py
+++ b/scripts/sync_protobuf/_utils.py
@@ -2,8 +2,9 @@
 
 import subprocess
 import sys
+from collections.abc import Iterable
 from http.client import HTTPResponse
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 from urllib.request import urlopen
 from zipfile import ZipFile
 
diff --git a/tests/mypy_test.py b/tests/mypy_test.py
index 9ccc0138229c..bf3a234ebdd8 100755
--- a/tests/mypy_test.py
+++ b/tests/mypy_test.py
@@ -18,8 +18,8 @@
 from itertools import product
 from pathlib import Path
 from threading import Lock
-from typing import Any, NamedTuple
-from typing_extensions import Annotated, TypeAlias
+from typing import Annotated, Any, NamedTuple
+from typing_extensions import TypeAlias
 
 import tomli
 from packaging.requirements import Requirement