From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Tue, 24 Nov 2020 01:41:36 +0000 (+0000)
Subject: pq enums __module__ changed to psycopg3.pq
X-Git-Tag: 3.0.dev0~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49e8a8bd095f033326e263f476462d31ee134da6;p=thirdparty%2Fpsycopg.git

pq enums __module__ changed to psycopg3.pq

I have found cases of its writability in the stdlib, so I'm satisfied it
can be done.
---

diff --git a/psycopg3/psycopg3/errors.py b/psycopg3/psycopg3/errors.py
index ea51fbbbc..687c0bcde 100644
--- a/psycopg3/psycopg3/errors.py
+++ b/psycopg3/psycopg3/errors.py
@@ -21,7 +21,7 @@ DBAPI-defined Exceptions are defined in the following hierarchy::
 from typing import Any, Callable, Dict, Optional, Sequence, Tuple, Type, Union
 from typing import cast
 from psycopg3.pq.proto import PGresult
-from psycopg3.pq.enums import DiagnosticField
+from psycopg3.pq._enums import DiagnosticField
 
 
 class Warning(Exception):
diff --git a/psycopg3/psycopg3/pq/__init__.py b/psycopg3/psycopg3/pq/__init__.py
index f4233492e..940d23adc 100644
--- a/psycopg3/psycopg3/pq/__init__.py
+++ b/psycopg3/psycopg3/pq/__init__.py
@@ -13,17 +13,10 @@ import os
 import logging
 from typing import Callable, Type
 
-from .enums import (
-    ConnStatus,
-    PollingStatus,
-    ExecStatus,
-    TransactionStatus,
-    Ping,
-    DiagnosticField,
-    Format,
-)
 from .misc import ConninfoOption, PQerror, PGnotify, PGresAttDesc
 from .misc import error_message
+from ._enums import ConnStatus, DiagnosticField, ExecStatus, Format
+from ._enums import Ping, PollingStatus, TransactionStatus
 from . import proto
 
 logger = logging.getLogger(__name__)
diff --git a/psycopg3/psycopg3/pq/enums.py b/psycopg3/psycopg3/pq/_enums.py
similarity index 94%
rename from psycopg3/psycopg3/pq/enums.py
rename to psycopg3/psycopg3/pq/_enums.py
index c42645fd7..e850e8b31 100644
--- a/psycopg3/psycopg3/pq/enums.py
+++ b/psycopg3/psycopg3/pq/_enums.py
@@ -12,6 +12,8 @@ class ConnStatus(IntEnum):
     Current status of the connection.
     """
 
+    __module__ = "psycopg3.pq"
+
     OK = 0
     """The connection is in a working state."""
     BAD = auto()
@@ -37,6 +39,8 @@ class PollingStatus(IntEnum):
     If ``READING`` or ``WRITING`` you may select before polling again.
     """
 
+    __module__ = "psycopg3.pq"
+
     FAILED = 0
     """Connection attempt failed."""
     READING = auto()
@@ -54,6 +58,8 @@ class ExecStatus(IntEnum):
     The status of a command.
     """
 
+    __module__ = "psycopg3.pq"
+
     EMPTY_QUERY = 0
     """The string sent to the server was empty."""
 
@@ -102,6 +108,8 @@ class TransactionStatus(IntEnum):
     The transaction status of a connection.
     """
 
+    __module__ = "psycopg3.pq"
+
     IDLE = 0
     """Connection ready, no transaction active."""
 
@@ -121,6 +129,8 @@ class TransactionStatus(IntEnum):
 class Ping(IntEnum):
     """Response from a ping attempt."""
 
+    __module__ = "psycopg3.pq"
+
     OK = 0
     """
     The server is running and appears to be accepting connections.
@@ -147,6 +157,8 @@ class DiagnosticField(IntEnum):
     Fields in an error report.
     """
 
+    __module__ = "psycopg3.pq"
+
     # from postgres_ext.h
     SEVERITY = ord("S")
     SEVERITY_NONLOCALIZED = ord("V")
@@ -173,6 +185,8 @@ class Format(IntEnum):
     The format of a query argument or return value.
     """
 
+    __module__ = "psycopg3.pq"
+
     TEXT = 0
     """Text parameter."""
     BINARY = 1
diff --git a/psycopg3/psycopg3/pq/misc.py b/psycopg3/psycopg3/pq/misc.py
index c3eed579a..f4a02bf59 100644
--- a/psycopg3/psycopg3/pq/misc.py
+++ b/psycopg3/psycopg3/pq/misc.py
@@ -7,7 +7,7 @@ Various functionalities to make easier to work with the libpq.
 from typing import cast, NamedTuple, Optional, Union
 
 from ..errors import OperationalError
-from .enums import DiagnosticField, ConnStatus
+from ._enums import DiagnosticField, ConnStatus
 from .proto import PGconn, PGresult
 
 
diff --git a/psycopg3/psycopg3/pq/pq_ctypes.py b/psycopg3/psycopg3/pq/pq_ctypes.py
index 30fb39ba6..7d27dc633 100644
--- a/psycopg3/psycopg3/pq/pq_ctypes.py
+++ b/psycopg3/psycopg3/pq/pq_ctypes.py
@@ -18,18 +18,11 @@ from ctypes import c_char_p, c_int, c_size_t, c_ulong
 from typing import Any, Callable, List, Optional, Sequence, Tuple
 from typing import cast as t_cast, TYPE_CHECKING
 
-from .enums import (
-    ConnStatus,
-    PollingStatus,
-    ExecStatus,
-    TransactionStatus,
-    Ping,
-    DiagnosticField,
-    Format,
-)
+from . import _pq_ctypes as impl
 from .misc import PGnotify, ConninfoOption, PQerror, PGresAttDesc
 from .misc import error_message
-from . import _pq_ctypes as impl
+from ._enums import ConnStatus, DiagnosticField, ExecStatus, Format
+from ._enums import Ping, PollingStatus, TransactionStatus
 
 if TYPE_CHECKING:
     from . import proto
diff --git a/psycopg3/psycopg3/pq/proto.py b/psycopg3/psycopg3/pq/proto.py
index 18a50c96f..145d0a291 100644
--- a/psycopg3/psycopg3/pq/proto.py
+++ b/psycopg3/psycopg3/pq/proto.py
@@ -8,15 +8,8 @@ from typing import Any, Callable, List, Optional, Sequence, Tuple
 from typing import TYPE_CHECKING
 from typing_extensions import Protocol
 
-from .enums import (
-    ConnStatus,
-    PollingStatus,
-    ExecStatus,
-    TransactionStatus,
-    Ping,
-    DiagnosticField,
-    Format,
-)
+from ._enums import ConnStatus, DiagnosticField, ExecStatus, Format
+from ._enums import Ping, PollingStatus, TransactionStatus
 
 if TYPE_CHECKING:
     from .misc import PGnotify, ConninfoOption, PGresAttDesc
diff --git a/psycopg3/psycopg3/sql.py b/psycopg3/psycopg3/sql.py
index 580daf211..249830ae8 100644
--- a/psycopg3/psycopg3/sql.py
+++ b/psycopg3/psycopg3/sql.py
@@ -6,14 +6,10 @@ SQL composition utility module
 
 import string
 from typing import Any, Iterator, List, Optional, Sequence, Union
-from typing import TYPE_CHECKING
 
 from .pq import Escaping, Format
 from .proto import AdaptContext
 
-if TYPE_CHECKING:
-    import psycopg3
-
 
 def quote(obj: Any, context: AdaptContext = None) -> str:
     """
@@ -411,9 +407,7 @@ class Placeholder(Composable):
 
     """
 
-    def __init__(
-        self, name: str = "", format: "psycopg3.pq.Format" = Format.TEXT
-    ):
+    def __init__(self, name: str = "", format: Format = Format.TEXT):
         super().__init__(name)
         if not isinstance(name, str):
             raise TypeError(f"expected string as name, got {name!r}")
diff --git a/psycopg3_c/psycopg3_c/adapt.pyx b/psycopg3_c/psycopg3_c/adapt.pyx
index dc4407f77..a61d3eacd 100644
--- a/psycopg3_c/psycopg3_c/adapt.pyx
+++ b/psycopg3_c/psycopg3_c/adapt.pyx
@@ -21,7 +21,7 @@ from psycopg3_c cimport libpq as impl
 from psycopg3_c.adapt cimport cloader_func, get_context_func
 from psycopg3_c.pq_cython cimport Escaping
 
-from psycopg3.pq.enums import Format
+from psycopg3.pq import Format
 
 import logging
 logger = logging.getLogger("psycopg3.adapt")
diff --git a/psycopg3_c/psycopg3_c/pq_cython.pyx b/psycopg3_c/psycopg3_c/pq_cython.pyx
index 1b1c8530d..3de96b0a6 100644
--- a/psycopg3_c/psycopg3_c/pq_cython.pyx
+++ b/psycopg3_c/psycopg3_c/pq_cython.pyx
@@ -16,7 +16,7 @@ from psycopg3_c.libpq cimport Oid
 
 from psycopg3.pq.misc import PGnotify, ConninfoOption, PQerror, PGresAttDesc
 from psycopg3.pq.misc import error_message
-from psycopg3.pq.enums import (
+from psycopg3.pq import (
     ConnStatus,
     PollingStatus,
     ExecStatus,
diff --git a/psycopg3_c/psycopg3_c/transform.pyx b/psycopg3_c/psycopg3_c/transform.pyx
index 948c3d1bf..6952cf76a 100644
--- a/psycopg3_c/psycopg3_c/transform.pyx
+++ b/psycopg3_c/psycopg3_c/transform.pyx
@@ -17,7 +17,7 @@ from psycopg3_c cimport libpq, oids
 from psycopg3_c.pq_cython cimport PGresult
 
 from psycopg3 import errors as e
-from psycopg3.pq.enums import Format
+from psycopg3.pq import Format
 
 
 cdef class RowLoader: