From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Wed, 7 May 2025 01:59:05 +0000 (+0200)
Subject: style: drop string type aliases
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90e5e5901fccb9faaa9add9a8c4610c5a476fa1b;p=thirdparty%2Fpsycopg.git

style: drop string type aliases
---

diff --git a/psycopg/psycopg/_acompat.py b/psycopg/psycopg/_acompat.py
index 04a5c6f2d..3511e0e7b 100644
--- a/psycopg/psycopg/_acompat.py
+++ b/psycopg/psycopg/_acompat.py
@@ -19,7 +19,7 @@ from collections.abc import Callable, Coroutine
 from ._compat import TypeVar
 
 Worker: TypeAlias = threading.Thread
-AWorker: TypeAlias = "asyncio.Task[None]"
+AWorker: TypeAlias = asyncio.Task[None]
 T = TypeVar("T")
 
 
diff --git a/psycopg/psycopg/_adapters_map.py b/psycopg/psycopg/_adapters_map.py
index f3142c02a..6c72f31e6 100644
--- a/psycopg/psycopg/_adapters_map.py
+++ b/psycopg/psycopg/_adapters_map.py
@@ -279,7 +279,7 @@ class AdaptersMap:
         from psycopg import types
 
         if cls.__module__.startswith(types.__name__):
-            if new := cast("type[RV]", getattr(_psycopg, cls.__name__, None)):
+            if new := cast(type[RV], getattr(_psycopg, cls.__name__, None)):
                 self._optimised[cls] = new
                 return new
 
diff --git a/psycopg/psycopg/_preparing.py b/psycopg/psycopg/_preparing.py
index 2be4a3c66..7dbcd66c1 100644
--- a/psycopg/psycopg/_preparing.py
+++ b/psycopg/psycopg/_preparing.py
@@ -19,7 +19,7 @@ if TYPE_CHECKING:
     from .pq.abc import PGresult
     from ._connection_base import BaseConnection
 
-Key: TypeAlias = "tuple[bytes, tuple[int, ...]]"
+Key: TypeAlias = tuple[bytes, tuple[int, ...]]
 
 COMMAND_OK = pq.ExecStatus.COMMAND_OK
 TUPLES_OK = pq.ExecStatus.TUPLES_OK
@@ -48,7 +48,7 @@ class PrepareManager:
         # Counter to generate prepared statements names
         self._prepared_idx = 0
 
-        self._to_flush = deque["bytes | None"]()
+        self._to_flush = deque[bytes | None]()
 
     @staticmethod
     def key(query: PostgresQuery) -> Key:
diff --git a/psycopg/psycopg/_py_transformer.py b/psycopg/psycopg/_py_transformer.py
index 0f449b620..ffba74e8c 100644
--- a/psycopg/psycopg/_py_transformer.py
+++ b/psycopg/psycopg/_py_transformer.py
@@ -30,8 +30,8 @@ if TYPE_CHECKING:
     from ._connection_base import BaseConnection
 
 DumperCache: TypeAlias = "dict[DumperKey, abc.Dumper]"
-OidDumperCache: TypeAlias = "dict[int, abc.Dumper]"
-LoaderCache: TypeAlias = "dict[int, abc.Loader]"
+OidDumperCache: TypeAlias = dict[int, abc.Dumper]
+LoaderCache: TypeAlias = dict[int, abc.Loader]
 
 TEXT = pq.Format.TEXT
 PY_TEXT = PyFormat.TEXT
diff --git a/psycopg/psycopg/_struct.py b/psycopg/psycopg/_struct.py
index 4926f5d4f..08e1e5ba1 100644
--- a/psycopg/psycopg/_struct.py
+++ b/psycopg/psycopg/_struct.py
@@ -14,9 +14,9 @@ from . import errors as e
 from .abc import Buffer
 
 PackInt: TypeAlias = Callable[[int], bytes]
-UnpackInt: TypeAlias = Callable[[Buffer], "tuple[int]"]
+UnpackInt: TypeAlias = Callable[[Buffer], tuple[int]]
 PackFloat: TypeAlias = Callable[[float], bytes]
-UnpackFloat: TypeAlias = Callable[[Buffer], "tuple[float]"]
+UnpackFloat: TypeAlias = Callable[[Buffer], tuple[float]]
 
 
 class UnpackLen(Protocol):
diff --git a/psycopg/psycopg/_typeinfo.py b/psycopg/psycopg/_typeinfo.py
index 1f897b33b..5586dc026 100644
--- a/psycopg/psycopg/_typeinfo.py
+++ b/psycopg/psycopg/_typeinfo.py
@@ -26,7 +26,7 @@ if TYPE_CHECKING:
     from .connection_async import AsyncConnection
 
 T = TypeVar("T", bound="TypeInfo")
-RegistryKey: TypeAlias = "str | int | tuple[type, int]"
+RegistryKey: TypeAlias = str | int | tuple[type, int]
 
 
 class TypeInfo:
diff --git a/psycopg/psycopg/abc.py b/psycopg/psycopg/abc.py
index fbab53ff1..a95c9e069 100644
--- a/psycopg/psycopg/abc.py
+++ b/psycopg/psycopg/abc.py
@@ -14,10 +14,10 @@ from ._enums import PyFormat as PyFormat
 from ._compat import LiteralString, TypeVar
 
 if TYPE_CHECKING:
-    from . import sql  # noqa: F401
+    from . import sql
     from .rows import Row, RowMaker
     from .pq.abc import PGresult
-    from .waiting import Ready, Wait  # noqa: F401
+    from .waiting import Ready, Wait
     from ._adapters_map import AdaptersMap
     from ._connection_base import BaseConnection
 
@@ -40,7 +40,7 @@ ConnMapping: TypeAlias = Mapping[str, ConnParam]
 
 RV = TypeVar("RV")
 
-PQGenConn: TypeAlias = Generator["tuple[int, Wait]", "Ready | int", RV]
+PQGenConn: TypeAlias = Generator[tuple[int, "Wait"], "Ready | int", RV]
 """Generator for processes where the connection file number can change.
 
 This can happen in connection and reset, but not in normal querying.
@@ -63,7 +63,7 @@ class WaitFunc(Protocol):
 
 # Adaptation types
 
-DumpFunc: TypeAlias = Callable[[Any], "Buffer | None"]
+DumpFunc: TypeAlias = Callable[[Any], Buffer | None]
 LoadFunc: TypeAlias = Callable[[Buffer], Any]
 
 
diff --git a/psycopg/psycopg/errors.py b/psycopg/psycopg/errors.py
index be11e6c7c..2dfc76090 100644
--- a/psycopg/psycopg/errors.py
+++ b/psycopg/psycopg/errors.py
@@ -31,7 +31,7 @@ from .pq._enums import ConnStatus, DiagnosticField, PipelineStatus, TransactionS
 if TYPE_CHECKING:
     from .pq.misc import ConninfoOption, PGnotify
 
-ErrorInfo: TypeAlias = "PGresult | dict[int, bytes | None] | None"
+ErrorInfo: TypeAlias = PGresult | dict[int, bytes | None] | None
 
 _sqlcodes: dict[str, type[Error]] = {}
 
diff --git a/psycopg/psycopg/types/enum.py b/psycopg/psycopg/types/enum.py
index fef2f1e40..9c718675a 100644
--- a/psycopg/psycopg/types/enum.py
+++ b/psycopg/psycopg/types/enum.py
@@ -23,13 +23,13 @@ if TYPE_CHECKING:
 
 E = TypeVar("E", bound=Enum)
 
-EnumDumpMap: TypeAlias = "dict[E, bytes]"
-EnumLoadMap: TypeAlias = "dict[bytes, E]"
-EnumMapping: TypeAlias = "Mapping[E, str] | Sequence[tuple[E, str]] | None"
+EnumDumpMap: TypeAlias = dict[E, bytes]
+EnumLoadMap: TypeAlias = dict[bytes, E]
+EnumMapping: TypeAlias = Mapping[E, str] | Sequence[tuple[E, str]] | None
 
 # Hashable versions
-_HEnumDumpMap: TypeAlias = "tuple[tuple[E, bytes], ...]"
-_HEnumLoadMap: TypeAlias = "tuple[tuple[bytes, E], ...]"
+_HEnumDumpMap: TypeAlias = tuple[tuple[E, bytes], ...]
+_HEnumLoadMap: TypeAlias = tuple[tuple[bytes, E], ...]
 
 TEXT = Format.TEXT
 BINARY = Format.BINARY
@@ -143,7 +143,7 @@ def register_enum(
         raise TypeError("no info passed. Is the requested enum available?")
 
     if enum is None:
-        enum = cast("type[E]", _make_enum(info.name, tuple(info.labels)))
+        enum = cast(type[E], _make_enum(info.name, tuple(info.labels)))
 
     info.enum = enum
     adapters = context.adapters if context else postgres.adapters
diff --git a/psycopg/psycopg/types/hstore.py b/psycopg/psycopg/types/hstore.py
index cf91f6142..49cd19a19 100644
--- a/psycopg/psycopg/types/hstore.py
+++ b/psycopg/psycopg/types/hstore.py
@@ -46,7 +46,7 @@ _I2B = [i.to_bytes(4, "big") for i in range(64)]
 """Lookup list for small ints to bytes conversions."""
 
 
-Hstore: TypeAlias = "dict[str, str | None]"
+Hstore: TypeAlias = dict[str, str | None]
 
 
 class BaseHstoreDumper(RecursiveDumper):
diff --git a/psycopg/psycopg/types/json.py b/psycopg/psycopg/types/json.py
index d5b6149cc..36ce929a7 100644
--- a/psycopg/psycopg/types/json.py
+++ b/psycopg/psycopg/types/json.py
@@ -17,8 +17,8 @@ from ..pq import Format
 from ..adapt import AdaptersMap, Buffer, Dumper, Loader, PyFormat
 from ..errors import DataError
 
-JsonDumpsFunction: TypeAlias = Callable[[Any], "str | bytes"]
-JsonLoadsFunction: TypeAlias = Callable[["str | bytes"], Any]
+JsonDumpsFunction: TypeAlias = Callable[[Any], str | bytes]
+JsonLoadsFunction: TypeAlias = Callable[[str | bytes], Any]
 
 
 def set_json_dumps(
diff --git a/psycopg_pool/psycopg_pool/_acompat.py b/psycopg_pool/psycopg_pool/_acompat.py
index 03ff960b8..f5f3a022c 100644
--- a/psycopg_pool/psycopg_pool/_acompat.py
+++ b/psycopg_pool/psycopg_pool/_acompat.py
@@ -31,7 +31,7 @@ ALock = asyncio.Lock
 sleep = time.sleep
 
 Worker: TypeAlias = threading.Thread
-AWorker: TypeAlias = "asyncio.Task[None]"
+AWorker: TypeAlias = asyncio.Task[None]
 
 
 def current_thread_name() -> str:
diff --git a/psycopg_pool/psycopg_pool/abc.py b/psycopg_pool/psycopg_pool/abc.py
index 5a14c42be..16d6d745c 100644
--- a/psycopg_pool/psycopg_pool/abc.py
+++ b/psycopg_pool/psycopg_pool/abc.py
@@ -12,7 +12,7 @@ from collections.abc import Awaitable, Callable
 from ._compat import TypeVar
 
 if TYPE_CHECKING:
-    from typing import Any  # noqa: F401
+    from typing import Any
 
     from psycopg import AsyncConnection, Connection  # noqa: F401
     from psycopg.rows import TupleRow  # noqa: F401
diff --git a/psycopg_pool/psycopg_pool/null_pool.py b/psycopg_pool/psycopg_pool/null_pool.py
index 0370702ef..884eab850 100644
--- a/psycopg_pool/psycopg_pool/null_pool.py
+++ b/psycopg_pool/psycopg_pool/null_pool.py
@@ -31,7 +31,7 @@ class NullConnectionPool(_BaseNullConnectionPool, ConnectionPool[CT]):
         self,
         conninfo: str = "",
         *,
-        connection_class: type[CT] = cast("type[CT]", Connection),
+        connection_class: type[CT] = cast(type[CT], Connection),
         kwargs: dict[str, Any] | None = None,
         min_size: int = 0,
         max_size: int | None = None,
diff --git a/psycopg_pool/psycopg_pool/null_pool_async.py b/psycopg_pool/psycopg_pool/null_pool_async.py
index 53a2201c9..a037597fa 100644
--- a/psycopg_pool/psycopg_pool/null_pool_async.py
+++ b/psycopg_pool/psycopg_pool/null_pool_async.py
@@ -27,7 +27,7 @@ class AsyncNullConnectionPool(_BaseNullConnectionPool, AsyncConnectionPool[ACT])
         self,
         conninfo: str = "",
         *,
-        connection_class: type[ACT] = cast("type[ACT]", AsyncConnection),
+        connection_class: type[ACT] = cast(type[ACT], AsyncConnection),
         kwargs: dict[str, Any] | None = None,
         min_size: int = 0,  # Note: min_size default value changed to 0.
         max_size: int | None = None,
diff --git a/psycopg_pool/psycopg_pool/pool.py b/psycopg_pool/psycopg_pool/pool.py
index 1c6e38825..8626c6c09 100644
--- a/psycopg_pool/psycopg_pool/pool.py
+++ b/psycopg_pool/psycopg_pool/pool.py
@@ -42,7 +42,7 @@ class ConnectionPool(Generic[CT], BasePool):
         self,
         conninfo: str = "",
         *,
-        connection_class: type[CT] = cast("type[CT]", Connection),
+        connection_class: type[CT] = cast(type[CT], Connection),
         kwargs: dict[str, Any] | None = None,
         min_size: int = 4,
         max_size: int | None = None,
diff --git a/psycopg_pool/psycopg_pool/pool_async.py b/psycopg_pool/psycopg_pool/pool_async.py
index ce7f07088..796955f14 100644
--- a/psycopg_pool/psycopg_pool/pool_async.py
+++ b/psycopg_pool/psycopg_pool/pool_async.py
@@ -42,7 +42,7 @@ class AsyncConnectionPool(Generic[ACT], BasePool):
         self,
         conninfo: str = "",
         *,
-        connection_class: type[ACT] = cast("type[ACT]", AsyncConnection),
+        connection_class: type[ACT] = cast(type[ACT], AsyncConnection),
         kwargs: dict[str, Any] | None = None,
         min_size: int = 4,
         max_size: int | None = None,
diff --git a/tests/crdb/test_copy.py b/tests/crdb/test_copy.py
index aa2d1024b..f4967a7d4 100644
--- a/tests/crdb/test_copy.py
+++ b/tests/crdb/test_copy.py
@@ -124,7 +124,7 @@ def test_copy_in_records(conn, format):
     ensure_table(cur, sample_tabledef)
 
     with cur.copy(f"copy copy_in from stdin {copyopt(format)}") as copy:
-        row: "tuple[Any, ...]"
+        row: tuple[Any, ...]
         for row in sample_records:
             if format == pq.Format.BINARY:
                 row = tuple((Int4(i) if isinstance(i, int) else i for i in row))
diff --git a/tests/crdb/test_copy_async.py b/tests/crdb/test_copy_async.py
index 60c52ab52..ed4d604c9 100644
--- a/tests/crdb/test_copy_async.py
+++ b/tests/crdb/test_copy_async.py
@@ -123,7 +123,7 @@ async def test_copy_in_records(aconn, format):
     await ensure_table_async(cur, sample_tabledef)
 
     async with cur.copy(f"copy copy_in from stdin {copyopt(format)}") as copy:
-        row: "tuple[Any, ...]"
+        row: tuple[Any, ...]
         for row in sample_records:
             if format == pq.Format.BINARY:
                 row = tuple(Int4(i) if isinstance(i, int) else i for i in row)