]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
Don't use Python enums in C PGconn.status
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Sun, 10 Jan 2021 19:10:05 +0000 (20:10 +0100)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Tue, 12 Jan 2021 15:14:23 +0000 (16:14 +0100)
Leftover from previous cleaning.

psycopg3_c/psycopg3_c/_psycopg3/generators.pyx
psycopg3_c/psycopg3_c/pq.pyx
psycopg3_c/psycopg3_c/pq/pgconn.pyx

index 0d0eb545440643634bee47b0d288aa451f69360c..ed1be65c0e9bb1ba56166c8fca1d99f18b5d2b9e 100644 (file)
@@ -25,7 +25,7 @@ def connect(conninfo: str) -> PQGenConn[proto.PGconn]:
 
     """
     cdef pq.PGconn conn = pq.PGconn.connect_start(conninfo.encode("utf8"))
-    logger.debug("connection started, status %s", conn.status.name)
+    logger.debug("connection started, status %s", conn.status)
     cdef libpq.PGconn *pgconn_ptr = conn.pgconn_ptr
     cdef int conn_status = libpq.PQstatus(pgconn_ptr)
     cdef int poll_status
@@ -37,7 +37,7 @@ def connect(conninfo: str) -> PQGenConn[proto.PGconn]:
             )
 
         poll_status = libpq.PQconnectPoll(pgconn_ptr)
-        logger.debug("connection polled, status %s", conn.status.name)
+        logger.debug("connection polled, status %s", conn.status)
         if poll_status == libpq.PGRES_POLLING_OK:
             break
         elif poll_status == libpq.PGRES_POLLING_READING:
index c3018ce51dd3dbaa11d8ace89f60f0c3dafc08b0..ccc2bb520cf7faf09fd313a707ae69dd0ae96538 100644 (file)
@@ -6,8 +6,7 @@ libpq Python wrapper using cython bindings.
 
 from psycopg3_c.pq cimport libpq
 
-from psycopg3.pq import ConnStatus, PollingStatus, ExecStatus
-from psycopg3.pq import TransactionStatus, Ping, DiagnosticField, Format
+from psycopg3.pq import Format
 from psycopg3.pq.misc import PQerror, error_message
 
 __impl__ = 'c'
index acd4ac2ccb855bca5c3270fcbf8615b2bef0306d..d92db842ce4c2a05759c35d358a18b4e323a4a01 100644 (file)
@@ -130,9 +130,8 @@ cdef class PGconn:
         return _call_bytes(self, libpq.PQoptions)
 
     @property
-    def status(self) -> ConnStatus:
-        cdef int rv = libpq.PQstatus(self.pgconn_ptr)
-        return ConnStatus(rv)
+    def status(self) -> int:
+        return libpq.PQstatus(self.pgconn_ptr)
 
     @property
     def transaction_status(self) -> int: