pq made into a package

diff --git a/psycopg3/pq.py b/psycopg3/pq/__init__.py
similarity index 96%
rename from psycopg3/pq.py
rename to psycopg3/pq/__init__.py
index 4832b10542605a100589d727805143bfd66a3481..0d3aec5e5d4862b000ec3d6e5e4e081af61089b2 100644 (file)
--- a/psycopg3/pq.py
+++ b/psycopg3/pq/__init__.py
@@ -9,7 +9,7 @@ implementation-dependant but all the implementations share the same interface.
 
 # Copyright (C) 2020 The Psycopg Team
 
-from .pq_enums import (
+from .enums import (
     ConnStatus,
     PollingStatus,
     ExecStatus,

diff --git a/psycopg3/_pq_ctypes.py b/psycopg3/pq/_pq_ctypes.py
similarity index 100%
rename from psycopg3/_pq_ctypes.py
rename to psycopg3/pq/_pq_ctypes.py

diff --git a/psycopg3/pq_encodings.py b/psycopg3/pq/encodings.py
similarity index 100%
rename from psycopg3/pq_encodings.py
rename to psycopg3/pq/encodings.py

diff --git a/psycopg3/pq_enums.py b/psycopg3/pq/enums.py
similarity index 100%
rename from psycopg3/pq_enums.py
rename to psycopg3/pq/enums.py

diff --git a/psycopg3/pq_ctypes.py b/psycopg3/pq/pq_ctypes.py
similarity index 99%
rename from psycopg3/pq_ctypes.py
rename to psycopg3/pq/pq_ctypes.py
index 94eec08963ced4a2650fe2f774b75fc71431e77e..6ce377fcda862e7e19b96dfe86080952bf4b7a9c 100644 (file)
--- a/psycopg3/pq_ctypes.py
+++ b/psycopg3/pq/pq_ctypes.py
@@ -12,14 +12,14 @@ implementation.
 from collections import namedtuple
 from ctypes import c_char_p, pointer
 
-from .pq_enums import (
+from .enums import (
     ConnStatus,
     PollingStatus,
     ExecStatus,
     TransactionStatus,
     Ping,
 )
-from .pq_encodings import py_codecs
+from .encodings import py_codecs
 from . import _pq_ctypes as impl
 
 

diff --git a/tests/test_pq_pgconn.py b/tests/test_pq_pgconn.py
index 4a72c23339b8542cec775aad7b70c89e83d99a7f..f73c9b87b3d2906c27cb4763bb73ba58de530de0 100644 (file)
--- a/tests/test_pq_pgconn.py
+++ b/tests/test_pq_pgconn.py
@@ -2,22 +2,20 @@ from select import select
 
 import pytest
 
-from psycopg3.pq_enums import ConnStatus, PollingStatus, Ping
-
 
 def test_connectdb(pq, dsn):
     conn = pq.PGconn.connect(dsn)
-    assert conn.status == ConnStatus.CONNECTION_OK, conn.error_message
+    assert conn.status == pq.ConnStatus.CONNECTION_OK, conn.error_message
 
 
 def test_connectdb_bytes(pq, dsn):
     conn = pq.PGconn.connect(dsn.encode("utf8"))
-    assert conn.status == ConnStatus.CONNECTION_OK, conn.error_message
+    assert conn.status == pq.ConnStatus.CONNECTION_OK, conn.error_message
 
 
 def test_connectdb_error(pq):
     conn = pq.PGconn.connect("dbname=psycopg3_test_not_for_real")
-    assert conn.status == ConnStatus.CONNECTION_BAD
+    assert conn.status == pq.ConnStatus.CONNECTION_BAD
 
 
 @pytest.mark.parametrize("baddsn", [None, 42])
@@ -29,35 +27,35 @@ def test_connectdb_badtype(pq, baddsn):
 def test_connect_async(pq, dsn):
     conn = pq.PGconn.connect_start(dsn)
     while 1:
-        assert conn.status != ConnStatus.CONNECTION_BAD
+        assert conn.status != pq.ConnStatus.CONNECTION_BAD
         rv = conn.connect_poll()
-        if rv == PollingStatus.PGRES_POLLING_OK:
+        if rv == pq.PollingStatus.PGRES_POLLING_OK:
             break
-        elif rv == PollingStatus.PGRES_POLLING_READING:
+        elif rv == pq.PollingStatus.PGRES_POLLING_READING:
             select([conn.socket], [], [])
-        elif rv == PollingStatus.PGRES_POLLING_WRITING:
+        elif rv == pq.PollingStatus.PGRES_POLLING_WRITING:
             select([], [conn.socket], [])
         else:
             assert False, rv
 
-    assert conn.status == ConnStatus.CONNECTION_OK
+    assert conn.status == pq.ConnStatus.CONNECTION_OK
 
 
 def test_connect_async_bad(pq, dsn):
     conn = pq.PGconn.connect_start("dbname=psycopg3_test_not_for_real")
     while 1:
-        assert conn.status != ConnStatus.CONNECTION_BAD
+        assert conn.status != pq.ConnStatus.CONNECTION_BAD
         rv = conn.connect_poll()
-        if rv == PollingStatus.PGRES_POLLING_FAILED:
+        if rv == pq.PollingStatus.PGRES_POLLING_FAILED:
             break
-        elif rv == PollingStatus.PGRES_POLLING_READING:
+        elif rv == pq.PollingStatus.PGRES_POLLING_READING:
             select([conn.socket], [], [])
-        elif rv == PollingStatus.PGRES_POLLING_WRITING:
+        elif rv == pq.PollingStatus.PGRES_POLLING_WRITING:
             select([], [conn.socket], [])
         else:
             assert False, rv
 
-    assert conn.status == ConnStatus.CONNECTION_BAD
+    assert conn.status == pq.ConnStatus.CONNECTION_BAD
 
 
 def test_info(pq, dsn, pgconn):
@@ -74,36 +72,36 @@ def test_info(pq, dsn, pgconn):
     assert dbname.val == name
 
 
-def test_reset(pgconn):
-    assert pgconn.status == ConnStatus.CONNECTION_OK
+def test_reset(pq, pgconn):
+    assert pgconn.status == pq.ConnStatus.CONNECTION_OK
     # TODO: break it
     pgconn.reset()
-    assert pgconn.status == ConnStatus.CONNECTION_OK
+    assert pgconn.status == pq.ConnStatus.CONNECTION_OK
 
 
-def test_reset_async(pgconn):
-    assert pgconn.status == ConnStatus.CONNECTION_OK
+def test_reset_async(pq, pgconn):
+    assert pgconn.status == pq.ConnStatus.CONNECTION_OK
     # TODO: break it
     pgconn.reset_start()
     while 1:
         rv = pgconn.connect_poll()
-        if rv == PollingStatus.PGRES_POLLING_READING:
+        if rv == pq.PollingStatus.PGRES_POLLING_READING:
             select([pgconn.socket], [], [])
-        elif rv == PollingStatus.PGRES_POLLING_WRITING:
+        elif rv == pq.PollingStatus.PGRES_POLLING_WRITING:
             select([], [pgconn.socket], [])
         else:
             break
 
-    assert rv == PollingStatus.PGRES_POLLING_OK
-    assert pgconn.status == ConnStatus.CONNECTION_OK
+    assert rv == pq.PollingStatus.PGRES_POLLING_OK
+    assert pgconn.status == pq.ConnStatus.CONNECTION_OK
 
 
 def test_ping(pq, dsn):
     rv = pq.PGconn.ping(dsn)
-    assert rv == Ping.PQPING_OK
+    assert rv == pq.Ping.PQPING_OK
 
     rv = pq.PGconn.ping("port=99999")
-    assert rv == Ping.PQPING_NO_RESPONSE
+    assert rv == pq.Ping.PQPING_NO_RESPONSE
 
 
 def test_db(pgconn):