Dropped "Type" suffix from enum

diff --git a/psycopg3/pq.py b/psycopg3/pq.py
index 63332fef688982efcc5bd7e3b27141b0d2596d2e..ecc6a9f7bc1e3cfffe8114a13e6b426e0f2f4341 100644 (file)
--- a/psycopg3/pq.py
+++ b/psycopg3/pq.py
@@ -9,10 +9,10 @@ implementation-dependant but all the implementations share the same interface.
 
 # Copyright (C) 2020 The Psycopg Team
 
-from .pq_enums import ConnStatusType
+from .pq_enums import ConnStatus
 
 from . import pq_ctypes as pq_module
 
 PGconn = pq_module.PGconn
 
-__all__ = ("ConnStatusType", "PGconn")
+__all__ = ("ConnStatus", "PGconn")

diff --git a/psycopg3/pq_ctypes.py b/psycopg3/pq_ctypes.py
index 6f51054863ecb2f6aec249aa8b7ae0c1394ff63f..9322b8ae66a87b2904f2be4112bc1a32d72d9358 100644 (file)
--- a/psycopg3/pq_ctypes.py
+++ b/psycopg3/pq_ctypes.py
@@ -8,7 +8,7 @@ implementation.
 
 # Copyright (C) 2020 The Psycopg Team
 
-from .pq_enums import ConnStatusType
+from .pq_enums import ConnStatus
 
 from . import _pq_ctypes as impl
 
@@ -33,7 +33,7 @@ class PGconn:
     @property
     def status(self):
         rv = impl.PQstatus(self.pgconn_ptr)
-        return ConnStatusType(rv)
+        return ConnStatus(rv)
 
     @property
     def error_message(self):

diff --git a/psycopg3/pq_enums.py b/psycopg3/pq_enums.py
index 338063c6ec4560d9d72895abd292323e89b5b64f..a1b0dfa39797265202fe4522bd5b8e09c5397ddf 100644 (file)
--- a/psycopg3/pq_enums.py
+++ b/psycopg3/pq_enums.py
@@ -7,6 +7,6 @@ libpq enum definitions for psycopg3
 from enum import IntEnum
 
 
-class ConnStatusType(IntEnum):
+class ConnStatus(IntEnum):
     CONNECTION_OK = 0
     CONNECTION_BAD = 1

diff --git a/tests/test_pq.py b/tests/test_pq.py
index fb0bebb155a705329bf13cf9a7f4cfaba1f47409..16a8babf2db04d928536f352db1f92f757202249 100644 (file)
--- a/tests/test_pq.py
+++ b/tests/test_pq.py
@@ -3,17 +3,17 @@ import pytest
 
 def test_PQconnectdb(pq, dsn):
     conn = pq.PGconn.connectdb(dsn)
-    assert conn.status == pq.ConnStatusType.CONNECTION_OK, conn.error_message
+    assert conn.status == pq.ConnStatus.CONNECTION_OK, conn.error_message
 
 
 def test_PQconnectdb_bytes(pq, dsn):
     conn = pq.PGconn.connectdb(dsn.encode("utf8"))
-    assert conn.status == pq.ConnStatusType.CONNECTION_OK, conn.error_message
+    assert conn.status == pq.ConnStatus.CONNECTION_OK, conn.error_message
 
 
 def test_PQconnectdb_error(pq):
     conn = pq.PGconn.connectdb("dbname=psycopg3_test_not_for_real")
-    assert conn.status == pq.ConnStatusType.CONNECTION_BAD
+    assert conn.status == pq.ConnStatus.CONNECTION_BAD
 
 
 @pytest.mark.parametrize("baddsn", [None, 42])