From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 27 Dec 2024 23:27:51 +0000 (+0100)
Subject: chore: drop pre-3.9 if blocks
X-Git-Tag: 3.3.0.dev1~135^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9f86877fcf30cf26554750662bbdfd72c7a18d2;p=thirdparty%2Fpsycopg.git

chore: drop pre-3.9 if blocks
---

diff --git a/psycopg/psycopg/_compat.py b/psycopg/psycopg/_compat.py
index 7ffd76b8b..28a1edb6a 100644
--- a/psycopg/psycopg/_compat.py
+++ b/psycopg/psycopg/_compat.py
@@ -5,29 +5,11 @@ compatibility functions for different Python versions
 # Copyright (C) 2021 The Psycopg Team
 
 import sys
-from functools import partial
-from typing import Any
-
-if sys.version_info >= (3, 9):
-    from asyncio import to_thread
-    from zoneinfo import ZoneInfo
-    from functools import cache
-    from collections import Counter, deque as Deque
-    from collections.abc import Callable
-else:
-    import asyncio
-    from typing import Callable, Counter, Deque, TypeVar
-    from functools import lru_cache
-    from backports.zoneinfo import ZoneInfo
-
-    cache = lru_cache(maxsize=None)
-
-    R = TypeVar("R")
 
-    async def to_thread(func: Callable[..., R], /, *args: Any, **kwargs: Any) -> R:
-        loop = asyncio.get_running_loop()
-        func_call = partial(func, *args, **kwargs)
-        return await loop.run_in_executor(None, func_call)
+from asyncio import to_thread
+from zoneinfo import ZoneInfo
+from functools import cache
+from collections import Counter, deque as Deque
 
 
 if sys.version_info >= (3, 10):
diff --git a/psycopg_pool/psycopg_pool/_compat.py b/psycopg_pool/psycopg_pool/_compat.py
index fc13e29fb..2f8a329f7 100644
--- a/psycopg_pool/psycopg_pool/_compat.py
+++ b/psycopg_pool/psycopg_pool/_compat.py
@@ -7,13 +7,7 @@ compatibility functions for different Python versions
 from __future__ import annotations
 
 import sys
-
-import psycopg.errors as e
-
-if sys.version_info >= (3, 9):
-    from collections import Counter, deque as Deque
-else:
-    from typing import Counter, Deque
+from collections import Counter, deque as Deque
 
 if sys.version_info >= (3, 10):
     from typing import TypeAlias
@@ -30,6 +24,8 @@ if sys.version_info >= (3, 13):
 else:
     from typing_extensions import TypeVar
 
+import psycopg.errors as e
+
 __all__ = [
     "Counter",
     "Deque",
diff --git a/tests/utils.py b/tests/utils.py
index 98f42915d..95e5ff99b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -3,18 +3,13 @@ from __future__ import annotations
 import re
 import sys
 import operator
+import collections
 from typing import Callable
 from contextlib import contextmanager
 
+import pytest
 
-if sys.version_info >= (3, 9):
-    import collections
-
-    Counter = collections.Counter
-else:
-    import typing
-
-    Counter = typing.Counter
+Counter = collections.Counter
 
 if sys.version_info >= (3, 11):
     import typing
@@ -25,9 +20,6 @@ else:
 
     assert_type = typing_extensions.assert_type
 
-
-import pytest
-
 eur = "\u20ac"