From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Fri, 27 Dec 2024 23:45:13 +0000 (+0100)
Subject: refactor: drop deprecated collection.abc aliases
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06f50aed59579da2b35a359c3e59d1eebe62e576;p=thirdparty%2Fpsycopg.git

refactor: drop deprecated collection.abc aliases
---

diff --git a/psycopg/psycopg/_acompat.py b/psycopg/psycopg/_acompat.py
index 83aeba36d..4f9043c6f 100644
--- a/psycopg/psycopg/_acompat.py
+++ b/psycopg/psycopg/_acompat.py
@@ -13,7 +13,8 @@ from __future__ import annotations
 import queue
 import asyncio
 import threading
-from typing import Any, Callable, Coroutine
+from typing import Any, Callable
+from collections.abc import Coroutine
 
 from ._compat import TypeAlias, TypeVar
 
diff --git a/psycopg/psycopg/_column.py b/psycopg/psycopg/_column.py
index 92973824e..6c6dc6a76 100644
--- a/psycopg/psycopg/_column.py
+++ b/psycopg/psycopg/_column.py
@@ -6,8 +6,9 @@ The Column object in Cursor.description
 
 from __future__ import annotations
 
-from typing import Any, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 from operator import attrgetter
+from collections.abc import Sequence
 
 if TYPE_CHECKING:
     from ._cursor_base import BaseCursor
diff --git a/psycopg/psycopg/_copy.py b/psycopg/psycopg/_copy.py
index 6d85066d8..e5c5c64c3 100644
--- a/psycopg/psycopg/_copy.py
+++ b/psycopg/psycopg/_copy.py
@@ -11,7 +11,8 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from types import TracebackType
-from typing import Any, Iterator, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
+from collections.abc import Iterator, Sequence
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/_copy_async.py b/psycopg/psycopg/_copy_async.py
index 02d27bae3..39d06bc2e 100644
--- a/psycopg/psycopg/_copy_async.py
+++ b/psycopg/psycopg/_copy_async.py
@@ -8,7 +8,8 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from types import TracebackType
-from typing import Any, AsyncIterator, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
+from collections.abc import AsyncIterator, Sequence
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/_cursor_base.py b/psycopg/psycopg/_cursor_base.py
index 45b600674..826707da2 100644
--- a/psycopg/psycopg/_cursor_base.py
+++ b/psycopg/psycopg/_cursor_base.py
@@ -7,7 +7,8 @@ Psycopg BaseCursor object
 from __future__ import annotations
 
 from functools import partial
-from typing import Any, Generic, Iterable, NoReturn, Sequence
+from typing import Any, Generic, NoReturn
+from collections.abc import Iterable, Sequence
 from typing import TYPE_CHECKING
 
 from . import pq
diff --git a/psycopg/psycopg/_dns.py b/psycopg/psycopg/_dns.py
index 9dd67f0b5..a78aeda0d 100644
--- a/psycopg/psycopg/_dns.py
+++ b/psycopg/psycopg/_dns.py
@@ -11,7 +11,8 @@ import os
 import re
 import warnings
 from random import randint
-from typing import Any, DefaultDict, NamedTuple, Sequence, TYPE_CHECKING
+from typing import Any, DefaultDict, NamedTuple, TYPE_CHECKING
+from collections.abc import Sequence
 from collections import defaultdict
 
 try:
diff --git a/psycopg/psycopg/_preparing.py b/psycopg/psycopg/_preparing.py
index c48c86c09..4a06ff44f 100644
--- a/psycopg/psycopg/_preparing.py
+++ b/psycopg/psycopg/_preparing.py
@@ -7,7 +7,8 @@ Support for prepared statements
 from __future__ import annotations
 
 from enum import IntEnum, auto
-from typing import Any, Sequence, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
+from collections.abc import Sequence
 from collections import OrderedDict
 
 from . import pq
diff --git a/psycopg/psycopg/_py_transformer.py b/psycopg/psycopg/_py_transformer.py
index 53008949d..de77116b3 100644
--- a/psycopg/psycopg/_py_transformer.py
+++ b/psycopg/psycopg/_py_transformer.py
@@ -11,7 +11,8 @@ dependencies problems).
 
 from __future__ import annotations
 
-from typing import Any, Sequence, DefaultDict, TYPE_CHECKING
+from typing import Any, DefaultDict, TYPE_CHECKING
+from collections.abc import Sequence
 from collections import defaultdict
 
 from . import pq
diff --git a/psycopg/psycopg/_queries.py b/psycopg/psycopg/_queries.py
index 31522100b..ed33727d9 100644
--- a/psycopg/psycopg/_queries.py
+++ b/psycopg/psycopg/_queries.py
@@ -8,8 +8,8 @@ from __future__ import annotations
 
 import re
 from typing import Any, Callable, NamedTuple, TYPE_CHECKING
-from collections.abc import Mapping, Sequence
 from functools import lru_cache
+from collections.abc import Mapping, Sequence
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/_typeinfo.py b/psycopg/psycopg/_typeinfo.py
index 27a41a733..5758c6320 100644
--- a/psycopg/psycopg/_typeinfo.py
+++ b/psycopg/psycopg/_typeinfo.py
@@ -9,7 +9,8 @@ information to the adapters if needed.
 
 from __future__ import annotations
 
-from typing import Any, Iterator, overload, Sequence, TYPE_CHECKING
+from typing import Any, overload, TYPE_CHECKING
+from collections.abc import Iterator, Sequence
 
 from . import sql
 from . import errors as e
diff --git a/psycopg/psycopg/abc.py b/psycopg/psycopg/abc.py
index 470a23855..aadf96746 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 Any, Callable, Generator, Mapping
-from typing import Protocol, Sequence, TYPE_CHECKING, Union
+from typing import Any, Callable, Protocol, TYPE_CHECKING, Union
+from collections.abc import Generator, Mapping, Sequence
 
 from . import pq
 from ._enums import PyFormat as PyFormat
diff --git a/psycopg/psycopg/connection.py b/psycopg/psycopg/connection.py
index 1ff118195..2f0c03e5a 100644
--- a/psycopg/psycopg/connection.py
+++ b/psycopg/psycopg/connection.py
@@ -12,8 +12,9 @@ from __future__ import annotations
 import logging
 from time import monotonic
 from types import TracebackType
-from typing import Any, Generator, Iterator, cast, overload, TYPE_CHECKING
+from typing import Any, cast, overload, TYPE_CHECKING
 from contextlib import contextmanager
+from collections.abc import Generator, Iterator
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/connection_async.py b/psycopg/psycopg/connection_async.py
index 3bcbdd215..c581e7623 100644
--- a/psycopg/psycopg/connection_async.py
+++ b/psycopg/psycopg/connection_async.py
@@ -9,8 +9,9 @@ from __future__ import annotations
 import logging
 from time import monotonic
 from types import TracebackType
-from typing import Any, AsyncGenerator, AsyncIterator, cast, overload, TYPE_CHECKING
+from typing import Any, cast, overload, TYPE_CHECKING
 from contextlib import asynccontextmanager
+from collections.abc import AsyncGenerator, AsyncIterator
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/cursor.py b/psycopg/psycopg/cursor.py
index 0415ff319..0ce69a301 100644
--- a/psycopg/psycopg/cursor.py
+++ b/psycopg/psycopg/cursor.py
@@ -10,8 +10,9 @@ Psycopg Cursor object.
 from __future__ import annotations
 
 from types import TracebackType
-from typing import Any, Iterator, Iterable, TYPE_CHECKING, overload
+from typing import Any, TYPE_CHECKING, overload
 from contextlib import contextmanager
+from collections.abc import Iterator, Iterable
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/cursor_async.py b/psycopg/psycopg/cursor_async.py
index 7fddd6280..9a729bb98 100644
--- a/psycopg/psycopg/cursor_async.py
+++ b/psycopg/psycopg/cursor_async.py
@@ -7,8 +7,9 @@ Psycopg AsyncCursor object.
 from __future__ import annotations
 
 from types import TracebackType
-from typing import Any, AsyncIterator, Iterable, TYPE_CHECKING, overload
+from typing import Any, TYPE_CHECKING, overload
 from contextlib import asynccontextmanager
+from collections.abc import AsyncIterator, Iterable
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/dbapi20.py b/psycopg/psycopg/dbapi20.py
index 204e5712c..74da1e550 100644
--- a/psycopg/psycopg/dbapi20.py
+++ b/psycopg/psycopg/dbapi20.py
@@ -9,7 +9,8 @@ from __future__ import annotations
 import time
 import datetime as dt
 from math import floor
-from typing import Any, Sequence
+from typing import Any
+from collections.abc import Sequence
 
 from . import _oids
 from .abc import AdaptContext, Buffer
diff --git a/psycopg/psycopg/errors.py b/psycopg/psycopg/errors.py
index 4be182e3c..44902cf44 100644
--- a/psycopg/psycopg/errors.py
+++ b/psycopg/psycopg/errors.py
@@ -21,8 +21,9 @@ DBAPI-defined Exceptions are defined in the following hierarchy::
 from __future__ import annotations
 
 from dataclasses import dataclass, field, fields
-from typing import Any, Callable, NoReturn, Sequence, TYPE_CHECKING
+from typing import Any, Callable, NoReturn, TYPE_CHECKING
 from asyncio import CancelledError
+from collections.abc import Sequence
 
 from .pq.abc import PGconn, PGresult
 from .pq._enums import ConnStatus, DiagnosticField, PipelineStatus, TransactionStatus
diff --git a/psycopg/psycopg/pq/abc.py b/psycopg/psycopg/pq/abc.py
index 56cfe2762..aa6e5208a 100644
--- a/psycopg/psycopg/pq/abc.py
+++ b/psycopg/psycopg/pq/abc.py
@@ -6,7 +6,8 @@ Protocol objects to represent objects exposed by different pq implementations.
 
 from __future__ import annotations
 
-from typing import Any, Callable, Protocol, Sequence, TYPE_CHECKING, Union
+from typing import Any, Callable, Protocol, TYPE_CHECKING, Union
+from collections.abc import Sequence
 
 from ._enums import Format, Trace
 from .._compat import Self, TypeAlias
diff --git a/psycopg/psycopg/pq/pq_ctypes.py b/psycopg/psycopg/pq/pq_ctypes.py
index 27f0b0fed..259215c6c 100644
--- a/psycopg/psycopg/pq/pq_ctypes.py
+++ b/psycopg/psycopg/pq/pq_ctypes.py
@@ -19,8 +19,8 @@ from weakref import ref
 
 from ctypes import Array, POINTER, cast, string_at, create_string_buffer, byref
 from ctypes import addressof, c_char_p, c_int, c_size_t, c_ulong, c_void_p, py_object
-from typing import Any, Callable, Sequence
-from typing import cast as t_cast, TYPE_CHECKING
+from typing import Any, Callable, cast as t_cast, TYPE_CHECKING
+from collections.abc import Sequence
 
 from .. import errors as e
 from .._encodings import pg2pyenc
diff --git a/psycopg/psycopg/rows.py b/psycopg/psycopg/rows.py
index 61c3d610a..927f2cd1b 100644
--- a/psycopg/psycopg/rows.py
+++ b/psycopg/psycopg/rows.py
@@ -7,9 +7,9 @@ psycopg row factories
 from __future__ import annotations
 
 import functools
-from typing import Any, Callable, NamedTuple, NoReturn
-from typing import TYPE_CHECKING, Protocol, Sequence
+from typing import Any, Callable, NamedTuple, NoReturn, Protocol, TYPE_CHECKING
 from collections import namedtuple
+from collections.abc import Sequence
 
 from . import pq
 from . import errors as e
diff --git a/psycopg/psycopg/server_cursor.py b/psycopg/psycopg/server_cursor.py
index c1492b386..e3e402403 100644
--- a/psycopg/psycopg/server_cursor.py
+++ b/psycopg/psycopg/server_cursor.py
@@ -6,8 +6,9 @@ psycopg server-side cursor objects.
 
 from __future__ import annotations
 
-from typing import Any, AsyncIterator, Iterable, Iterator, TYPE_CHECKING, overload
+from typing import Any, overload, TYPE_CHECKING
 from warnings import warn
+from collections.abc import AsyncIterator, Iterable, Iterator
 
 from . import pq
 from . import sql
diff --git a/psycopg/psycopg/sql.py b/psycopg/psycopg/sql.py
index c0b5b8e96..22d52f1c3 100644
--- a/psycopg/psycopg/sql.py
+++ b/psycopg/psycopg/sql.py
@@ -9,7 +9,8 @@ from __future__ import annotations
 import codecs
 import string
 from abc import ABC, abstractmethod
-from typing import Any, Iterator, Iterable, Sequence
+from typing import Any
+from collections.abc import Iterator, Iterable, Sequence
 
 from .pq import Escaping
 from .abc import AdaptContext
diff --git a/psycopg/psycopg/transaction.py b/psycopg/psycopg/transaction.py
index d0a3aa349..21c36c773 100644
--- a/psycopg/psycopg/transaction.py
+++ b/psycopg/psycopg/transaction.py
@@ -9,7 +9,8 @@ from __future__ import annotations
 import logging
 
 from types import TracebackType
-from typing import Any, Generic, Iterator, TYPE_CHECKING
+from typing import Any, Generic, TYPE_CHECKING
+from collections.abc import Iterator
 
 from . import pq
 from . import sql
diff --git a/psycopg/psycopg/types/composite.py b/psycopg/psycopg/types/composite.py
index 576529a05..8346ff334 100644
--- a/psycopg/psycopg/types/composite.py
+++ b/psycopg/psycopg/types/composite.py
@@ -8,9 +8,9 @@ from __future__ import annotations
 
 import re
 import struct
+from typing import Any, Callable, cast, NamedTuple, TYPE_CHECKING
 from collections import namedtuple
-from typing import Any, Callable, cast, Iterator
-from typing import NamedTuple, Sequence, TYPE_CHECKING
+from collections.abc import Iterator, Sequence
 
 from .. import pq
 from .. import abc
diff --git a/psycopg/psycopg/types/enum.py b/psycopg/psycopg/types/enum.py
index 82e7f174c..cfc09c342 100644
--- a/psycopg/psycopg/types/enum.py
+++ b/psycopg/psycopg/types/enum.py
@@ -5,7 +5,8 @@ Adapters for the enum type.
 from __future__ import annotations
 
 from enum import Enum
-from typing import Any, Generic, Mapping, Sequence, cast, TYPE_CHECKING
+from typing import Any, Generic, cast, TYPE_CHECKING
+from collections.abc import Mapping, Sequence
 
 from .. import sql
 from .. import postgres
diff --git a/psycopg/psycopg/types/multirange.py b/psycopg/psycopg/types/multirange.py
index 1bf98ed34..97b9f8f9e 100644
--- a/psycopg/psycopg/types/multirange.py
+++ b/psycopg/psycopg/types/multirange.py
@@ -7,8 +7,9 @@ Support for multirange types adaptation.
 from __future__ import annotations
 
 from decimal import Decimal
-from typing import Any, Generic, Iterable, MutableSequence, overload, TYPE_CHECKING
+from typing import Any, Generic, overload, TYPE_CHECKING
 from datetime import date, datetime
+from collections.abc import Iterable, MutableSequence
 
 from .. import sql
 from .. import _oids
diff --git a/psycopg_pool/psycopg_pool/_acompat.py b/psycopg_pool/psycopg_pool/_acompat.py
index 6f111ebf7..aede93137 100644
--- a/psycopg_pool/psycopg_pool/_acompat.py
+++ b/psycopg_pool/psycopg_pool/_acompat.py
@@ -15,7 +15,8 @@ import queue
 import asyncio
 import logging
 import threading
-from typing import Any, Callable, Coroutine
+from typing import Any, Callable
+from collections.abc import Coroutine
 
 from ._compat import TypeAlias, TypeVar
 
diff --git a/psycopg_pool/psycopg_pool/abc.py b/psycopg_pool/psycopg_pool/abc.py
index d79f82f87..bb67e98e3 100644
--- a/psycopg_pool/psycopg_pool/abc.py
+++ b/psycopg_pool/psycopg_pool/abc.py
@@ -6,7 +6,8 @@ Types used in the psycopg_pool package
 
 from __future__ import annotations
 
-from typing import Awaitable, Callable, TYPE_CHECKING, Union
+from typing import Callable, TYPE_CHECKING, Union
+from collections.abc import Awaitable
 
 from ._compat import TypeAlias, TypeVar
 
diff --git a/psycopg_pool/psycopg_pool/pool.py b/psycopg_pool/psycopg_pool/pool.py
index 3696a83ab..0f1a0e932 100644
--- a/psycopg_pool/psycopg_pool/pool.py
+++ b/psycopg_pool/psycopg_pool/pool.py
@@ -14,7 +14,8 @@ import warnings
 from abc import ABC, abstractmethod
 from time import monotonic
 from types import TracebackType
-from typing import Any, Iterator, cast, Generic
+from typing import Any, cast, Generic
+from collections.abc import Iterator
 from weakref import ref
 from contextlib import contextmanager
 
diff --git a/psycopg_pool/psycopg_pool/pool_async.py b/psycopg_pool/psycopg_pool/pool_async.py
index 718cb9c25..2ecb298b5 100644
--- a/psycopg_pool/psycopg_pool/pool_async.py
+++ b/psycopg_pool/psycopg_pool/pool_async.py
@@ -11,7 +11,8 @@ import warnings
 from abc import ABC, abstractmethod
 from time import monotonic
 from types import TracebackType
-from typing import Any, AsyncIterator, cast, Generic
+from typing import Any, cast, Generic
+from collections.abc import AsyncIterator
 from weakref import ref
 from contextlib import asynccontextmanager
 
diff --git a/tests/fix_pq.py b/tests/fix_pq.py
index 1cff7e18b..8cc1f8a88 100644
--- a/tests/fix_pq.py
+++ b/tests/fix_pq.py
@@ -3,8 +3,9 @@ from __future__ import annotations
 import os
 import sys
 import ctypes
-from typing import Iterator, NamedTuple
+from typing import NamedTuple
 from tempfile import TemporaryFile
+from collections.abc import Iterator
 
 import pytest
 
diff --git a/tests/pq/test_pgconn.py b/tests/pq/test_pgconn.py
index 6c555a229..7ea2084f2 100644
--- a/tests/pq/test_pgconn.py
+++ b/tests/pq/test_pgconn.py
@@ -9,7 +9,8 @@ import logging
 import weakref
 from functools import partial
 from select import select
-from typing import Iterator, TYPE_CHECKING
+from typing import TYPE_CHECKING
+from collections.abc import Iterator
 
 import pytest
 
diff --git a/tests/scripts/bench-411.py b/tests/scripts/bench-411.py
index f6a9b0003..904893147 100644
--- a/tests/scripts/bench-411.py
+++ b/tests/scripts/bench-411.py
@@ -7,7 +7,8 @@ import random
 import asyncio
 import logging
 from enum import Enum
-from typing import Any, Generator
+from typing import Any
+from collections.abc import Generator
 from argparse import ArgumentParser, Namespace
 from contextlib import contextmanager
 from concurrent.futures import ThreadPoolExecutor
@@ -124,7 +125,7 @@ WHERE customer.id = %(id)s
 
 
 @contextmanager
-def time_log(message: str) -> Generator[None, None, None]:
+def time_log(message: str) -> Generator[None]:
     start = time.monotonic()
     yield
     end = time.monotonic()
diff --git a/tests/scripts/pipeline-demo.py b/tests/scripts/pipeline-demo.py
index 8f44e15e0..45956097f 100644
--- a/tests/scripts/pipeline-demo.py
+++ b/tests/scripts/pipeline-demo.py
@@ -15,7 +15,8 @@ import asyncio
 import logging
 from contextlib import contextmanager
 from functools import partial
-from typing import Any, Iterator, Sequence
+from typing import Any
+from collections.abc import Iterator, Sequence
 
 from psycopg import AsyncConnection, Connection
 from psycopg import pq, waiting
diff --git a/tests/typing_example.py b/tests/typing_example.py
index 12b51553f..02312c8d7 100644
--- a/tests/typing_example.py
+++ b/tests/typing_example.py
@@ -3,7 +3,8 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Callable, Sequence
+from typing import Any, Callable
+from collections.abc import Sequence
 
 from psycopg import Connection, Cursor, ServerCursor, connect, rows
 from psycopg import AsyncConnection, AsyncCursor, AsyncServerCursor