From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sun, 20 Dec 2020 18:51:02 +0000 (+0100)
Subject: libpq cython declarations moved to psycopg3_c/pq package
X-Git-Tag: 3.0.dev0~252^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30f427b304fe2341985568de508a40897b731d15;p=thirdparty%2Fpsycopg.git

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 baf0119e7..6eee221be 100644
--- 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
index 000000000..e69de29bb
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 b6537409e..cd70f1ecc 100644
--- 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 e7eaa806b..f8e5ca0fa 100644
--- 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 dc307caa8..f593801d1 100644
--- 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 488cd9958..0d7f770c6 100644
--- 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