From e9a849955e8bb608437f17d5a20349c34d7ba474 Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Fri, 13 Mar 2020 23:29:14 +1300 Subject: [PATCH] Dropped "Type" suffix from enum --- psycopg3/pq.py | 4 ++-- psycopg3/pq_ctypes.py | 4 ++-- psycopg3/pq_enums.py | 2 +- tests/test_pq.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/psycopg3/pq.py b/psycopg3/pq.py index 63332fef6..ecc6a9f7b 100644 --- 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 6f5105486..9322b8ae6 100644 --- 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 338063c6e..a1b0dfa39 100644 --- 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 fb0bebb15..16a8babf2 100644 --- 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]) -- 2.47.3