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 a96b397bc9eb6ec1c95f245176cbd4ecfcbd65ac..743761d827642cc90325b551d0aaec3e17e0fa5a 100644 (file)
--- 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 5c1ed180dc978d0bafdf156262b7a5eadaf9799d..7dd0113700fba6ca2de135cf7113aa66d011964d 100644 (file)
--- 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 d5472437ac2122238f2c8fe5f9e88be8732cc515..3e3a90e4a96fea6fa597e411d2c644ac825175a6 100644 (file)
--- 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 69bf06e8a372b22f41ed11cd1f346574185c564d..a0e809c550b9289e9f9b31dfbacb33d083e6cf28 100644 (file)
--- 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 0bee499a904a3122dda67517730f9ca2970225e6..55c6ad10349d25f1c374d7958baa0c9330cde80e 100644 (file)
--- 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 3d07bb27989267aae85e5f9a0efffde2b525dbbd..b1546571d662b341209633f790586dabb9e7b9d6 100644 (file)
--- 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 e8adca98fbf9867c9a5db675730c7233d6ff06a7..9b4b6ce3d095b3064bb4cb28d4c57553656e41b3 100644 (file)
--- 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 f6643e54d1e50c8851b38f09c0987f454656d352..6977235748be9535e1c5defd8a538ae0381d3e17 100644 (file)
--- 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 4fdab440ca5e02118f0fdca8b7175c9380ccb5e7..f9b3efe7ee4d15d31b00128e5c5010f8151376cf 100644 (file)
--- 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 (file)
index e69de29..0000000

diff --git a/psycopg3_c/psycopg3_c/types/date.pyx b/psycopg3_c/psycopg3_c/types/date.pyx
index eba096b92d08d0a5de94a9a135743a2a7932ac5a..bb55e68435e43b807260341f4b10a969d3ed1b61 100644 (file)
--- 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 fb2e5aeba2e9bac36fdc2d77eca6e40a63ebb768..23894a3c3dd07abb6848c5c515e049b6a2fa08c1 100644 (file)
--- 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 de3f6faf69d948c31626a1fcbe447114991bc7a6..4feb104046d8dfb5ad12e641d7fce4d654606e8c 100644 (file)
--- 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 c7fc960bb29d118dc873d2ccf1735ffda27b42b5..0a57dcc7f7216f6a74ae9c10dcb2a17faa8548cc 100644 (file)
--- 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