libpq cython declarations moved to psycopg3_c/pq package

diff --git a/psycopg3_c/psycopg3_c/generators.pyx b/psycopg3_c/psycopg3_c/generators.pyx
index baf0119e7c3c09d42a49fd9f7e0847ea9cbcf2ad..6eee221be6f073e765448cf0949659b6f65be2cc 100644 (file)
--- a/psycopg3_c/psycopg3_c/generators.pyx
+++ b/psycopg3_c/psycopg3_c/generators.pyx
@@ -11,7 +11,7 @@ from psycopg3 import errors as e
 from psycopg3.proto import PQGen
 from psycopg3.waiting import Wait, Ready
 from psycopg3 import pq
-from psycopg3_c cimport libpq
+from psycopg3_c.pq cimport libpq
 from psycopg3_c.pq_cython cimport PGconn, PGresult
 
 cdef object WAIT_W = Wait.W

diff --git a/psycopg3_c/psycopg3_c/pq/__init__.py b/psycopg3_c/psycopg3_c/pq/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/psycopg3_c/psycopg3_c/libpq.pxd b/psycopg3_c/psycopg3_c/pq/libpq.pxd
similarity index 100%
rename from psycopg3_c/psycopg3_c/libpq.pxd
rename to psycopg3_c/psycopg3_c/pq/libpq.pxd

diff --git a/psycopg3_c/psycopg3_c/pq_cython.pxd b/psycopg3_c/psycopg3_c/pq_cython.pxd
index b6537409e817ff3e47aaca73cee1a9a332faa293..cd70f1eccc8e66bf6df1c2571f3307a22ef0c9b7 100644 (file)
--- a/psycopg3_c/psycopg3_c/pq_cython.pxd
+++ b/psycopg3_c/psycopg3_c/pq_cython.pxd
@@ -1,5 +1,5 @@
 from posix.fcntl cimport pid_t
-from psycopg3_c cimport libpq as impl
+from psycopg3_c.pq cimport libpq as impl
 
 ctypedef char *(*conn_bytes_f) (const impl.PGconn *)
 ctypedef int(*conn_int_f) (const impl.PGconn *)

diff --git a/psycopg3_c/psycopg3_c/pq_cython.pyx b/psycopg3_c/psycopg3_c/pq_cython.pyx
index e7eaa806bd9cb06e57fafbfaec8feae67abbc927..f8e5ca0fad34d34263acb7ccd8655eb9f1ec0bea 100644 (file)
--- a/psycopg3_c/psycopg3_c/pq_cython.pyx
+++ b/psycopg3_c/psycopg3_c/pq_cython.pyx
@@ -16,8 +16,8 @@ from cpython.bytearray cimport PyByteArray_AS_STRING
 import logging
 from typing import List, Optional, Sequence, Tuple
 
-from psycopg3_c cimport libpq as impl
-from psycopg3_c.libpq cimport Oid
+from psycopg3_c.pq cimport libpq as impl
+from psycopg3_c.pq.libpq cimport Oid
 
 from psycopg3.pq.misc import PGnotify, ConninfoOption, PQerror, PGresAttDesc
 from psycopg3.pq.misc import error_message

diff --git a/psycopg3_c/psycopg3_c/transform.pyx b/psycopg3_c/psycopg3_c/transform.pyx
index dc307caa88be5aad43f47cd0636a9f7c6e46e1c6..f593801d1129f33bf6f4a8ed062de0b93367c7af 100644 (file)
--- a/psycopg3_c/psycopg3_c/transform.pyx
+++ b/psycopg3_c/psycopg3_c/transform.pyx
@@ -13,7 +13,8 @@ from cpython.tuple cimport PyTuple_New, PyTuple_SET_ITEM
 
 from typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple
 
-from psycopg3_c cimport libpq, oids
+from psycopg3_c cimport oids
+from psycopg3_c.pq cimport libpq
 from psycopg3_c.pq_cython cimport PGresult
 
 from psycopg3 import errors as e

diff --git a/psycopg3_c/psycopg3_c/types/text.pyx b/psycopg3_c/psycopg3_c/types/text.pyx
index 488cd995848603b0a8ab9a08292883773254b7cb..0d7f770c64c63dcb56df66cd1cb80f6c2c8b09a2 100644 (file)
--- a/psycopg3_c/psycopg3_c/types/text.pyx
+++ b/psycopg3_c/psycopg3_c/types/text.pyx
@@ -8,7 +8,8 @@ from cpython.bytes cimport PyBytes_AsString, PyBytes_AsStringAndSize
 from cpython.unicode cimport PyUnicode_Decode, PyUnicode_DecodeUTF8
 from cpython.unicode cimport PyUnicode_AsUTF8String, PyUnicode_AsEncodedString
 
-from psycopg3_c cimport libpq, oids
+from psycopg3_c cimport oids
+from psycopg3_c.pq cimport libpq
 from psycopg3_c.pq_cython cimport Escaping