From: Daniele Varrazzo Date: Sun, 15 Mar 2020 04:14:49 +0000 (+1300) Subject: pq made into a package X-Git-Tag: 3.0.dev0~712 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c02446f94d0e33f303f63d6c72ae5189433327e;p=thirdparty%2Fpsycopg.git 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 4832b1054..0d3aec5e5 100644 --- 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 94eec0896..6ce377fcd 100644 --- 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 4a72c2333..f73c9b87b 100644 --- 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):