From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sun, 10 Jan 2021 19:10:05 +0000 (+0100)
Subject: Don't use Python enums in C PGconn.status
X-Git-Tag: 3.0.dev0~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=811b7fb9a41b528f3ba7aad017f1b171b92d333d;p=thirdparty%2Fpsycopg.git

Don't use Python enums in C PGconn.status

Leftover from previous cleaning.
---

diff --git a/psycopg3_c/psycopg3_c/_psycopg3/generators.pyx b/psycopg3_c/psycopg3_c/_psycopg3/generators.pyx
index 0d0eb5454..ed1be65c0 100644
--- a/psycopg3_c/psycopg3_c/_psycopg3/generators.pyx
+++ b/psycopg3_c/psycopg3_c/_psycopg3/generators.pyx
@@ -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:
diff --git a/psycopg3_c/psycopg3_c/pq.pyx b/psycopg3_c/psycopg3_c/pq.pyx
index c3018ce51..ccc2bb520 100644
--- a/psycopg3_c/psycopg3_c/pq.pyx
+++ b/psycopg3_c/psycopg3_c/pq.pyx
@@ -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'
diff --git a/psycopg3_c/psycopg3_c/pq/pgconn.pyx b/psycopg3_c/psycopg3_c/pq/pgconn.pyx
index acd4ac2cc..d92db842c 100644
--- a/psycopg3_c/psycopg3_c/pq/pgconn.pyx
+++ b/psycopg3_c/psycopg3_c/pq/pgconn.pyx
@@ -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: