follow up python 3.8 deprecation + poetry update

csernazs · csernazs · commit 3dff116cf8b0 · 2025-02-24T21:13:03.000+01:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/pytest_httpserver/blocking_httpserver.py b/pytest_httpserver/blocking_httpserver.py
@@ -4,8 +4,6 @@
 from queue import Queue
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Mapping
-from typing import Pattern
 
 from pytest_httpserver.httpserver import METHOD_ALL
 from pytest_httpserver.httpserver import UNDEFINED
@@ -16,6 +14,8 @@
 from pytest_httpserver.httpserver import URIPattern
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+    from re import Pattern
     from ssl import SSLContext
 
     from werkzeug import Request
diff --git a/pytest_httpserver/httpserver.py b/pytest_httpserver/httpserver.py
@@ -9,21 +9,19 @@
 import time
 import urllib.parse
 from collections import defaultdict
+from collections.abc import Iterable
+from collections.abc import Mapping
+from collections.abc import MutableMapping
 from contextlib import contextmanager
 from contextlib import suppress
 from copy import copy
 from enum import Enum
+from re import Pattern
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Callable
 from typing import ClassVar
-from typing import Iterable
-from typing import List
-from typing import Mapping
-from typing import MutableMapping
 from typing import Optional
-from typing import Pattern
-from typing import Tuple
 from typing import Union
 
 import werkzeug.http
@@ -44,7 +42,7 @@
 
 HEADERS_T = Union[
     Mapping[str, Union[str, Iterable[str]]],
-    Iterable[Tuple[str, str]],
+    Iterable[tuple[str, str]],
 ]
 
 HVMATCHER_T = Callable[[str, Optional[str], str], bool]
@@ -584,7 +582,7 @@ def __repr__(self) -> str:
         return retval
 
 
-class RequestHandlerList(List[RequestHandler]):
+class RequestHandlerList(list[RequestHandler]):
     """
     Represents a list of :py:class:`RequestHandler` objects.
 
diff --git a/scripts/release.py b/scripts/release.py
@@ -3,9 +3,9 @@
 import argparse
 import subprocess
 import sys
+from collections.abc import Iterable
 from pathlib import Path
 from shutil import which
-from typing import Iterable
 
 
 class UsageError(Exception):
diff --git a/tests/test_release.py b/tests/test_release.py
@@ -8,10 +8,13 @@
 import zipfile
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Iterable
+from typing import TYPE_CHECKING
 
 import pytest
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 try:
     import tomllib
 except ImportError:
diff --git a/tests/test_threaded.py b/tests/test_threaded.py
@@ -1,7 +1,7 @@
 import http.client
 import threading
 import time
-from typing import Iterable
+from collections.abc import Iterable
 
 import pytest
 from werkzeug import Request
