From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Wed, 7 May 2025 01:54:21 +0000 (+0200)
Subject: chore: drop use of deprecated aliases
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ab55043e8033fb31230f71f66399f7ba0d039f76;p=thirdparty%2Fpsycopg.git

chore: drop use of deprecated aliases
---

diff --git a/psycopg/psycopg/_acompat.py b/psycopg/psycopg/_acompat.py
index de8d8de6a..04a5c6f2d 100644
--- a/psycopg/psycopg/_acompat.py
+++ b/psycopg/psycopg/_acompat.py
@@ -13,8 +13,8 @@ from __future__ import annotations
 import queue
 import asyncio
 import threading
-from typing import Any, Callable, TypeAlias
-from collections.abc import Coroutine
+from typing import Any, TypeAlias
+from collections.abc import Callable, Coroutine
 
 from ._compat import TypeVar
 
diff --git a/psycopg/psycopg/_connection_base.py b/psycopg/psycopg/_connection_base.py
index 9a7754f55..53d06cc4f 100644
--- a/psycopg/psycopg/_connection_base.py
+++ b/psycopg/psycopg/_connection_base.py
@@ -8,11 +8,12 @@ from __future__ import annotations
 
 import sys
 import logging
-from typing import TYPE_CHECKING, Callable, Generic, NamedTuple, TypeAlias
+from typing import TYPE_CHECKING, Generic, NamedTuple, TypeAlias
 from weakref import ReferenceType, ref
 from warnings import warn
 from functools import partial
 from collections import deque
+from collections.abc import Callable
 
 from . import errors as e
 from . import generators, postgres, pq
diff --git a/psycopg/psycopg/_queries.py b/psycopg/psycopg/_queries.py
index 4da8a0d0b..14950738b 100644
--- a/psycopg/psycopg/_queries.py
+++ b/psycopg/psycopg/_queries.py
@@ -7,9 +7,9 @@ Utility module to manipulate queries
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Callable, NamedTuple, TypeAlias, TypeGuard
+from typing import TYPE_CHECKING, Any, NamedTuple, TypeAlias, TypeGuard
 from functools import lru_cache
-from collections.abc import Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
 
 from . import errors as e
 from . import pq
diff --git a/psycopg/psycopg/_struct.py b/psycopg/psycopg/_struct.py
index ddbee086c..4926f5d4f 100644
--- a/psycopg/psycopg/_struct.py
+++ b/psycopg/psycopg/_struct.py
@@ -7,7 +7,8 @@ Utility functions to deal with binary structs.
 from __future__ import annotations
 
 import struct
-from typing import Callable, Protocol, TypeAlias, cast
+from typing import Protocol, TypeAlias, cast
+from collections.abc import Callable
 
 from . import errors as e
 from .abc import Buffer
diff --git a/psycopg/psycopg/abc.py b/psycopg/psycopg/abc.py
index 029df2118..fbab53ff1 100644
--- a/psycopg/psycopg/abc.py
+++ b/psycopg/psycopg/abc.py
@@ -6,8 +6,8 @@ Protocol objects representing different implementations of the same classes.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Protocol, TypeAlias, Union
-from collections.abc import Generator, Mapping, Sequence
+from typing import TYPE_CHECKING, Any, Protocol, TypeAlias, Union
+from collections.abc import Callable, Generator, Mapping, Sequence
 
 from . import pq
 from ._enums import PyFormat as PyFormat
diff --git a/psycopg/psycopg/errors.py b/psycopg/psycopg/errors.py
index 0385daa6c..be11e6c7c 100644
--- a/psycopg/psycopg/errors.py
+++ b/psycopg/psycopg/errors.py
@@ -20,10 +20,10 @@ DBAPI-defined Exceptions are defined in the following hierarchy::
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, TypeAlias, TypeGuard
+from typing import TYPE_CHECKING, Any, NoReturn, TypeAlias, TypeGuard
 from asyncio import CancelledError
 from dataclasses import dataclass, field, fields
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 
 from .pq.abc import PGconn, PGresult
 from .pq._enums import ConnStatus, DiagnosticField, PipelineStatus, TransactionStatus
diff --git a/psycopg/psycopg/pq/__init__.py b/psycopg/psycopg/pq/__init__.py
index 4f242980d..4485f88b6 100644
--- a/psycopg/psycopg/pq/__init__.py
+++ b/psycopg/psycopg/pq/__init__.py
@@ -13,7 +13,7 @@ from __future__ import annotations
 
 import os
 import logging
-from typing import Callable
+from collections.abc import Callable
 
 from . import abc
 from .misc import ConninfoOption, PGnotify, PGresAttDesc, error_message, version_pretty
diff --git a/psycopg/psycopg/pq/_debug.py b/psycopg/psycopg/pq/_debug.py
index 6fb389112..3efd9a084 100644
--- a/psycopg/psycopg/pq/_debug.py
+++ b/psycopg/psycopg/pq/_debug.py
@@ -30,8 +30,9 @@ Suggested usage::
 
 import inspect
 import logging
-from typing import Any, Callable
+from typing import Any
 from functools import wraps
+from collections.abc import Callable
 
 from . import PGconn, abc
 from .misc import connection_summary
diff --git a/psycopg/psycopg/pq/abc.py b/psycopg/psycopg/pq/abc.py
index f67a6611f..bf4ae12bb 100644
--- a/psycopg/psycopg/pq/abc.py
+++ b/psycopg/psycopg/pq/abc.py
@@ -6,8 +6,8 @@ Protocol objects to represent objects exposed by different pq implementations.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Protocol, TypeAlias, Union
-from collections.abc import Sequence
+from typing import TYPE_CHECKING, Any, Protocol, TypeAlias, Union
+from collections.abc import Callable, Sequence
 
 from ._enums import Format, Trace
 from .._compat import Self
diff --git a/psycopg/psycopg/pq/pq_ctypes.py b/psycopg/psycopg/pq/pq_ctypes.py
index 207868b9d..d58396014 100644
--- a/psycopg/psycopg/pq/pq_ctypes.py
+++ b/psycopg/psycopg/pq/pq_ctypes.py
@@ -17,10 +17,10 @@ import logging
 from os import getpid
 from ctypes import POINTER, Array, addressof, byref, c_char_p, c_int, c_size_t, c_ulong
 from ctypes import c_void_p, cast, create_string_buffer, py_object, string_at
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 from typing import cast as t_cast
 from weakref import ref
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 
 from . import _pq_ctypes as impl
 from .. import errors as e
diff --git a/psycopg/psycopg/rows.py b/psycopg/psycopg/rows.py
index c9c806eb4..b0c685507 100644
--- a/psycopg/psycopg/rows.py
+++ b/psycopg/psycopg/rows.py
@@ -7,10 +7,9 @@ psycopg row factories
 from __future__ import annotations
 
 import functools
-from typing import TYPE_CHECKING, Any, Callable, NamedTuple, NoReturn, Protocol
-from typing import TypeAlias
+from typing import TYPE_CHECKING, Any, NamedTuple, NoReturn, Protocol, TypeAlias
 from collections import namedtuple
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 
 from . import errors as e
 from . import pq
diff --git a/psycopg/psycopg/types/array.py b/psycopg/psycopg/types/array.py
index 0b9465c4f..ae4685481 100644
--- a/psycopg/psycopg/types/array.py
+++ b/psycopg/psycopg/types/array.py
@@ -9,8 +9,9 @@ from __future__ import annotations
 import re
 import struct
 from math import prod
-from typing import Any, Callable, cast
+from typing import Any, cast
 from functools import cache
+from collections.abc import Callable
 
 from .. import errors as e
 from .. import postgres, pq
diff --git a/psycopg/psycopg/types/composite.py b/psycopg/psycopg/types/composite.py
index f72688191..22b14449c 100644
--- a/psycopg/psycopg/types/composite.py
+++ b/psycopg/psycopg/types/composite.py
@@ -8,10 +8,10 @@ from __future__ import annotations
 
 import re
 import struct
-from typing import TYPE_CHECKING, Any, Callable, NamedTuple, cast
+from typing import TYPE_CHECKING, Any, NamedTuple, cast
 from functools import cache
 from collections import namedtuple
-from collections.abc import Iterator, Sequence
+from collections.abc import Callable, Iterator, Sequence
 
 from .. import abc, postgres, pq, sql
 from .._oids import TEXT_OID
diff --git a/psycopg/psycopg/types/datetime.py b/psycopg/psycopg/types/datetime.py
index 1fcab4b97..1bcdc25f1 100644
--- a/psycopg/psycopg/types/datetime.py
+++ b/psycopg/psycopg/types/datetime.py
@@ -8,8 +8,9 @@ from __future__ import annotations
 
 import re
 import struct
-from typing import TYPE_CHECKING, Any, Callable, cast
+from typing import TYPE_CHECKING, Any, cast
 from datetime import date, datetime, time, timedelta, timezone
+from collections.abc import Callable
 
 from .. import _oids
 from ..pq import Format
diff --git a/psycopg/psycopg/types/json.py b/psycopg/psycopg/types/json.py
index ec8516be5..f35dd0a8a 100644
--- a/psycopg/psycopg/types/json.py
+++ b/psycopg/psycopg/types/json.py
@@ -7,8 +7,9 @@ Adapters for JSON types.
 from __future__ import annotations
 
 import json
-from typing import Any, Callable, TypeAlias
+from typing import Any, TypeAlias
 from functools import cache
+from collections.abc import Callable
 
 from .. import _oids, abc
 from .. import errors as e
diff --git a/psycopg/psycopg/types/net.py b/psycopg/psycopg/types/net.py
index ccc47c4ed..8199908d6 100644
--- a/psycopg/psycopg/types/net.py
+++ b/psycopg/psycopg/types/net.py
@@ -6,7 +6,8 @@ Adapters for network types.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, TypeAlias
+from typing import TYPE_CHECKING, TypeAlias
+from collections.abc import Callable
 
 from .. import _oids
 from ..pq import Format
diff --git a/psycopg/psycopg/types/numeric.py b/psycopg/psycopg/types/numeric.py
index 28fbc9aa1..3ff4df8ab 100644
--- a/psycopg/psycopg/types/numeric.py
+++ b/psycopg/psycopg/types/numeric.py
@@ -10,8 +10,9 @@ import sys
 import struct
 from abc import ABC, abstractmethod
 from math import log
-from typing import TYPE_CHECKING, Any, Callable, DefaultDict, cast
+from typing import TYPE_CHECKING, Any, DefaultDict, cast
 from decimal import Context, Decimal, DefaultContext
+from collections.abc import Callable
 
 from .. import _oids
 from .. import errors as e
diff --git a/psycopg/psycopg/types/uuid.py b/psycopg/psycopg/types/uuid.py
index 596337746..b094937ad 100644
--- a/psycopg/psycopg/types/uuid.py
+++ b/psycopg/psycopg/types/uuid.py
@@ -6,7 +6,8 @@ Adapters for the UUID type.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
+from collections.abc import Callable
 
 from .. import _oids
 from ..pq import Format
diff --git a/psycopg_pool/psycopg_pool/_acompat.py b/psycopg_pool/psycopg_pool/_acompat.py
index 4ec60afe3..03ff960b8 100644
--- a/psycopg_pool/psycopg_pool/_acompat.py
+++ b/psycopg_pool/psycopg_pool/_acompat.py
@@ -15,8 +15,8 @@ import queue
 import asyncio
 import logging
 import threading
-from typing import Any, Callable, TypeAlias
-from collections.abc import Coroutine
+from typing import Any, TypeAlias
+from collections.abc import Callable, Coroutine
 
 from ._compat import TypeVar
 
diff --git a/psycopg_pool/psycopg_pool/_task.py b/psycopg_pool/psycopg_pool/_task.py
index 7629d1c46..8e4b9bd60 100644
--- a/psycopg_pool/psycopg_pool/_task.py
+++ b/psycopg_pool/psycopg_pool/_task.py
@@ -6,8 +6,9 @@ Task for Scheduler and AsyncScheduler
 
 from __future__ import annotations
 
-from typing import Any, Callable
+from typing import Any
 from dataclasses import dataclass, field
+from collections.abc import Callable
 
 
 @dataclass(order=True)
diff --git a/psycopg_pool/psycopg_pool/abc.py b/psycopg_pool/psycopg_pool/abc.py
index 19b225041..5a14c42be 100644
--- a/psycopg_pool/psycopg_pool/abc.py
+++ b/psycopg_pool/psycopg_pool/abc.py
@@ -6,8 +6,8 @@ Types used in the psycopg_pool package
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, TypeAlias, Union
-from collections.abc import Awaitable
+from typing import TYPE_CHECKING, TypeAlias, Union
+from collections.abc import Awaitable, Callable
 
 from ._compat import TypeVar
 
diff --git a/psycopg_pool/psycopg_pool/sched.py b/psycopg_pool/psycopg_pool/sched.py
index 6fc4e2b91..6f2ece88b 100644
--- a/psycopg_pool/psycopg_pool/sched.py
+++ b/psycopg_pool/psycopg_pool/sched.py
@@ -20,7 +20,8 @@ from __future__ import annotations
 import logging
 from time import monotonic
 from heapq import heappop, heappush
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 from ._task import Task
 from ._acompat import Event, Lock
diff --git a/psycopg_pool/psycopg_pool/sched_async.py b/psycopg_pool/psycopg_pool/sched_async.py
index 3db6533d6..11298e50b 100644
--- a/psycopg_pool/psycopg_pool/sched_async.py
+++ b/psycopg_pool/psycopg_pool/sched_async.py
@@ -17,7 +17,8 @@ from __future__ import annotations
 import logging
 from time import monotonic
 from heapq import heappop, heappush
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 from ._task import Task
 from ._acompat import AEvent, ALock
diff --git a/tests/typing_example.py b/tests/typing_example.py
index 01cd46026..ae0747449 100644
--- a/tests/typing_example.py
+++ b/tests/typing_example.py
@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable
+from typing import Any
 from dataclasses import dataclass
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 
 from psycopg import AsyncConnection, AsyncCursor, AsyncServerCursor, Connection, Cursor
 from psycopg import ServerCursor, connect, rows
diff --git a/tests/utils.py b/tests/utils.py
index 0cdba8bf3..3be844f5e 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -3,8 +3,8 @@ from __future__ import annotations
 import re
 import sys
 import operator
-from typing import Callable
 from contextlib import contextmanager
+from collections.abc import Callable
 
 import pytest
 
diff --git a/tools/isort-psycopg/isort_psycopg.py b/tools/isort-psycopg/isort_psycopg.py
index ff5471604..d2eaf45b9 100644
--- a/tools/isort-psycopg/isort_psycopg.py
+++ b/tools/isort-psycopg/isort_psycopg.py
@@ -4,7 +4,8 @@ from __future__ import annotations
 
 import re
 import inspect
-from typing import Any, Callable, Iterable
+from typing import Any
+from collections.abc import Callable, Iterable
 
 from isort.sorting import naturally