From: Daniele Varrazzo Date: Sun, 29 Aug 2021 05:32:50 +0000 (+0200) Subject: mark compat module internal X-Git-Tag: 3.0.beta1~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a8ba26f907f3a02a1c45583c24d422b4b036fc1;p=thirdparty%2Fpsycopg.git mark compat module internal --- diff --git a/psycopg/psycopg/compat.py b/psycopg/psycopg/_compat.py similarity index 100% rename from psycopg/psycopg/compat.py rename to psycopg/psycopg/_compat.py diff --git a/psycopg/psycopg/_struct.py b/psycopg/psycopg/_struct.py index f390800eb..a36d62435 100644 --- a/psycopg/psycopg/_struct.py +++ b/psycopg/psycopg/_struct.py @@ -8,7 +8,7 @@ import struct from typing import Callable, cast, Optional, Tuple from .abc import Buffer -from .compat import Protocol +from ._compat import Protocol PackInt = Callable[[int], bytes] UnpackInt = Callable[[bytes], Tuple[int]] diff --git a/psycopg/psycopg/_tz.py b/psycopg/psycopg/_tz.py index ac5af7d13..a51047c82 100644 --- a/psycopg/psycopg/_tz.py +++ b/psycopg/psycopg/_tz.py @@ -8,8 +8,8 @@ import logging from typing import Dict, Optional, Union from datetime import timezone, tzinfo -from .compat import ZoneInfo from .pq.abc import PGconn +from ._compat import ZoneInfo logger = logging.getLogger("psycopg") diff --git a/psycopg/psycopg/abc.py b/psycopg/psycopg/abc.py index 1ba3448a6..56f7dfe47 100644 --- a/psycopg/psycopg/abc.py +++ b/psycopg/psycopg/abc.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING from . import pq from ._enums import PyFormat as PyFormat -from .compat import Protocol +from ._compat import Protocol if TYPE_CHECKING: from .sql import Composable diff --git a/psycopg/psycopg/connection_async.py b/psycopg/psycopg/connection_async.py index 9376a56f9..d14e19431 100644 --- a/psycopg/psycopg/connection_async.py +++ b/psycopg/psycopg/connection_async.py @@ -17,7 +17,7 @@ from .pq import Format from .abc import Params, PQGen, PQGenConn, Query, RV from .rows import Row, AsyncRowFactory, tuple_row, TupleRow from ._enums import IsolationLevel -from .compat import asynccontextmanager +from ._compat import asynccontextmanager from .conninfo import make_conninfo, conninfo_to_dict from .connection import BaseConnection, CursorRow, Notify from .generators import notifies diff --git a/psycopg/psycopg/copy.py b/psycopg/psycopg/copy.py index 3e15e1547..a237078f5 100644 --- a/psycopg/psycopg/copy.py +++ b/psycopg/psycopg/copy.py @@ -19,7 +19,7 @@ from . import errors as e from .pq import ExecStatus from .abc import ConnectionType, PQGen, Transformer from .adapt import PyFormat -from .compat import create_task +from ._compat import create_task from ._cmodule import _psycopg from .generators import copy_from, copy_to, copy_end diff --git a/psycopg/psycopg/cursor_async.py b/psycopg/psycopg/cursor_async.py index 516b6f32f..df263542e 100644 --- a/psycopg/psycopg/cursor_async.py +++ b/psycopg/psycopg/cursor_async.py @@ -13,8 +13,8 @@ from . import errors as e from .abc import Query, Params from .copy import AsyncCopy from .rows import Row, RowMaker, AsyncRowFactory -from .compat import asynccontextmanager from .cursor import BaseCursor, AnyCursor +from ._compat import asynccontextmanager if TYPE_CHECKING: from .connection_async import AsyncConnection diff --git a/psycopg/psycopg/pq/abc.py b/psycopg/psycopg/pq/abc.py index afa42b49b..1423ed485 100644 --- a/psycopg/psycopg/pq/abc.py +++ b/psycopg/psycopg/pq/abc.py @@ -8,7 +8,7 @@ from typing import Any, Callable, List, Optional, Sequence, Tuple, Union from typing import TYPE_CHECKING from ._enums import Format -from ..compat import Protocol +from .._compat import Protocol if TYPE_CHECKING: from .misc import PGnotify, ConninfoOption, PGresAttDesc diff --git a/psycopg/psycopg/rows.py b/psycopg/psycopg/rows.py index 4ca752638..255581897 100644 --- a/psycopg/psycopg/rows.py +++ b/psycopg/psycopg/rows.py @@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, Type, TypeVar from collections import namedtuple from . import errors as e -from .compat import Protocol +from ._compat import Protocol if TYPE_CHECKING: from .cursor import BaseCursor, Cursor diff --git a/psycopg_c/psycopg_c/types/datetime.pyx b/psycopg_c/psycopg_c/types/datetime.pyx index f8c586493..1aaa17803 100644 --- a/psycopg_c/psycopg_c/types/datetime.pyx +++ b/psycopg_c/psycopg_c/types/datetime.pyx @@ -31,7 +31,7 @@ from datetime import date, time, timedelta, datetime, timezone from psycopg_c._psycopg cimport endian from psycopg import errors as e -from psycopg.compat import ZoneInfo +from psycopg._compat import ZoneInfo # Initialise the datetime C API diff --git a/psycopg_pool/psycopg_pool/pool_async.py b/psycopg_pool/psycopg_pool/pool_async.py index a8977583f..965e930b2 100644 --- a/psycopg_pool/psycopg_pool/pool_async.py +++ b/psycopg_pool/psycopg_pool/pool_async.py @@ -17,7 +17,7 @@ from collections import deque from psycopg import errors as e from psycopg.pq import TransactionStatus -from psycopg.compat import Task, asynccontextmanager, create_task +from psycopg._compat import Task, asynccontextmanager, create_task from psycopg.connection_async import AsyncConnection from .base import ConnectionAttempt, BasePool diff --git a/tests/fix_faker.py b/tests/fix_faker.py index 724cb7a8c..ea3f5d570 100644 --- a/tests/fix_faker.py +++ b/tests/fix_faker.py @@ -13,7 +13,7 @@ import pytest import psycopg from psycopg import sql from psycopg.adapt import PyFormat -from psycopg.compat import asynccontextmanager +from psycopg._compat import asynccontextmanager from psycopg.types.range import Range from psycopg.types.numeric import Int4, Int8 diff --git a/tests/pool/test_pool_async.py b/tests/pool/test_pool_async.py index 4fdd0d77f..84befc020 100644 --- a/tests/pool/test_pool_async.py +++ b/tests/pool/test_pool_async.py @@ -9,7 +9,7 @@ import pytest import psycopg import psycopg_pool as pool from psycopg.pq import TransactionStatus -from psycopg.compat import create_task +from psycopg._compat import create_task pytestmark = [ pytest.mark.asyncio, diff --git a/tests/pool/test_sched_async.py b/tests/pool/test_sched_async.py index d18f7cb70..57aec74e7 100644 --- a/tests/pool/test_sched_async.py +++ b/tests/pool/test_sched_async.py @@ -5,7 +5,7 @@ from functools import partial import pytest -from psycopg.compat import create_task +from psycopg._compat import create_task from psycopg_pool.sched import AsyncScheduler pytestmark = [pytest.mark.asyncio, pytest.mark.timing] diff --git a/tests/test_concurrency_async.py b/tests/test_concurrency_async.py index f29a7ef66..d5ee75120 100644 --- a/tests/test_concurrency_async.py +++ b/tests/test_concurrency_async.py @@ -4,7 +4,7 @@ import asyncio from asyncio.queues import Queue import psycopg -from psycopg.compat import create_task +from psycopg._compat import create_task pytestmark = pytest.mark.asyncio