From: Daniele Varrazzo Date: Tue, 8 Jun 2021 01:42:43 +0000 (+0100) Subject: Drop utils sub-package X-Git-Tag: 3.0.dev0~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d44323b023b9b49459e1e8aff0917b6b09ae9f9;p=thirdparty%2Fpsycopg.git Drop utils sub-package --- diff --git a/psycopg3/psycopg3/utils/context.py b/psycopg3/psycopg3/_context.py similarity index 100% rename from psycopg3/psycopg3/utils/context.py rename to psycopg3/psycopg3/_context.py diff --git a/psycopg3/psycopg3/_tz.py b/psycopg3/psycopg3/_tz.py index a96b397bc..743761d82 100644 --- a/psycopg3/psycopg3/_tz.py +++ b/psycopg3/psycopg3/_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.proto import PGconn -from .utils.compat import ZoneInfo logger = logging.getLogger("psycopg3") diff --git a/psycopg3/psycopg3/utils/compat.py b/psycopg3/psycopg3/compat.py similarity index 96% rename from psycopg3/psycopg3/utils/compat.py rename to psycopg3/psycopg3/compat.py index 5c1ed180d..7dd011370 100644 --- a/psycopg3/psycopg3/utils/compat.py +++ b/psycopg3/psycopg3/compat.py @@ -22,7 +22,7 @@ if sys.version_info >= (3, 7): get_running_loop = asyncio.get_running_loop else: - from .context import asynccontextmanager + from ._context import asynccontextmanager get_running_loop = asyncio.get_event_loop diff --git a/psycopg3/psycopg3/connection.py b/psycopg3/psycopg3/connection.py index d5472437a..3e3a90e4a 100644 --- a/psycopg3/psycopg3/connection.py +++ b/psycopg3/psycopg3/connection.py @@ -26,12 +26,12 @@ from .sql import Composable from .rows import Row, RowFactory, tuple_row, TupleRow from .proto import AdaptContext, ConnectionType, Params, PQGen, PQGenConn from .proto import Query, RV +from .compat import asynccontextmanager from .cursor import Cursor, AsyncCursor from .conninfo import make_conninfo, ConnectionInfo from .generators import notifies from ._preparing import PrepareManager from .transaction import Transaction, AsyncTransaction -from .utils.compat import asynccontextmanager from .server_cursor import ServerCursor, AsyncServerCursor logger = logging.getLogger("psycopg3") diff --git a/psycopg3/psycopg3/copy.py b/psycopg3/psycopg3/copy.py index 69bf06e8a..a0e809c55 100644 --- a/psycopg3/psycopg3/copy.py +++ b/psycopg3/psycopg3/copy.py @@ -19,8 +19,8 @@ from . import errors as e from .pq import ExecStatus from .adapt import Format from .proto import ConnectionType, PQGen, Transformer +from .compat import create_task from .generators import copy_from, copy_to, copy_end -from .utils.compat import create_task if TYPE_CHECKING: from .pq.proto import PGresult diff --git a/psycopg3/psycopg3/cursor.py b/psycopg3/psycopg3/cursor.py index 0bee499a9..55c6ad103 100644 --- a/psycopg3/psycopg3/cursor.py +++ b/psycopg3/psycopg3/cursor.py @@ -19,10 +19,10 @@ from .pq import ExecStatus, Format from .copy import Copy, AsyncCopy from .rows import Row, RowFactory from .proto import ConnectionType, Query, Params, PQGen +from .compat import asynccontextmanager from ._column import Column from ._queries import PostgresQuery from ._preparing import Prepare -from .utils.compat import asynccontextmanager if TYPE_CHECKING: from .proto import Transformer diff --git a/psycopg3/psycopg3/pool/async_pool.py b/psycopg3/psycopg3/pool/async_pool.py index 3d07bb279..b1546571d 100644 --- a/psycopg3/psycopg3/pool/async_pool.py +++ b/psycopg3/psycopg3/pool/async_pool.py @@ -18,7 +18,7 @@ from collections import deque from .. import errors as e from ..pq import TransactionStatus from ..connection import AsyncConnection -from ..utils.compat import Task, asynccontextmanager, create_task +from ..compat import Task, asynccontextmanager, create_task from .base import ConnectionAttempt, BasePool from .sched import AsyncScheduler diff --git a/psycopg3/psycopg3/pq/proto.py b/psycopg3/psycopg3/pq/proto.py index e8adca98f..9b4b6ce3d 100644 --- a/psycopg3/psycopg3/pq/proto.py +++ b/psycopg3/psycopg3/pq/proto.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 ..utils.compat import Protocol +from ..compat import Protocol if TYPE_CHECKING: from .misc import PGnotify, ConninfoOption, PGresAttDesc diff --git a/psycopg3/psycopg3/proto.py b/psycopg3/psycopg3/proto.py index f6643e54d..697723574 100644 --- a/psycopg3/psycopg3/proto.py +++ b/psycopg3/psycopg3/proto.py @@ -10,7 +10,7 @@ from typing import TYPE_CHECKING from . import pq from ._enums import Format -from .utils.compat import Protocol +from .compat import Protocol if TYPE_CHECKING: from .sql import Composable diff --git a/psycopg3/psycopg3/rows.py b/psycopg3/psycopg3/rows.py index 4fdab440c..f9b3efe7e 100644 --- a/psycopg3/psycopg3/rows.py +++ b/psycopg3/psycopg3/rows.py @@ -11,7 +11,7 @@ from typing import Any, Callable, Dict, NamedTuple, Sequence, Tuple, Type from typing import TypeVar, TYPE_CHECKING from . import errors as e -from .utils.compat import Protocol +from .compat import Protocol if TYPE_CHECKING: from .cursor import AnyCursor diff --git a/psycopg3/psycopg3/utils/__init__.py b/psycopg3/psycopg3/utils/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/psycopg3_c/psycopg3_c/types/date.pyx b/psycopg3_c/psycopg3_c/types/date.pyx index eba096b92..bb55e6843 100644 --- a/psycopg3_c/psycopg3_c/types/date.pyx +++ b/psycopg3_c/psycopg3_c/types/date.pyx @@ -31,7 +31,7 @@ from datetime import date, time, timedelta, datetime, timezone from psycopg3_c._psycopg3 cimport endian from psycopg3 import errors as e -from psycopg3.utils.compat import ZoneInfo +from psycopg3.compat import ZoneInfo # Initialise the datetime C API diff --git a/tests/pool/test_pool_async.py b/tests/pool/test_pool_async.py index fb2e5aeba..23894a3c3 100644 --- a/tests/pool/test_pool_async.py +++ b/tests/pool/test_pool_async.py @@ -9,7 +9,7 @@ import pytest import psycopg3 from psycopg3 import pool from psycopg3.pq import TransactionStatus -from psycopg3.utils.compat import create_task +from psycopg3.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 de3f6faf6..4feb10404 100644 --- a/tests/pool/test_sched_async.py +++ b/tests/pool/test_sched_async.py @@ -5,8 +5,8 @@ from functools import partial import pytest +from psycopg3.compat import create_task from psycopg3.pool.sched import AsyncScheduler -from psycopg3.utils.compat import create_task pytestmark = pytest.mark.asyncio diff --git a/tests/test_concurrency_async.py b/tests/test_concurrency_async.py index c7fc960bb..0a57dcc7f 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 psycopg3 -from psycopg3.utils.compat import create_task +from psycopg3.compat import create_task pytestmark = pytest.mark.asyncio