From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Wed, 14 Sep 2022 14:14:32 +0000 (+0100)
Subject: refactor(psycopg_c): define loggers at module level
X-Git-Tag: 3.1.2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48961907b8ca4ba1b4f3f3437278b9bc08940b45;p=thirdparty%2Fpsycopg.git

refactor(psycopg_c): define loggers at module level
---

diff --git a/psycopg_c/psycopg_c/_psycopg.pyx b/psycopg_c/psycopg_c/_psycopg.pyx
index 6c325e7a3..45c281e12 100644
--- a/psycopg_c/psycopg_c/_psycopg.pyx
+++ b/psycopg_c/psycopg_c/_psycopg.pyx
@@ -11,9 +11,13 @@ from psycopg_c cimport pq
 from psycopg_c.pq cimport libpq
 from psycopg_c._psycopg cimport oids
 
+import logging
+
 from psycopg.pq import Format as _pq_Format
 from psycopg._enums import PyFormat as _py_Format
 
+logger = logging.getLogger("psycopg")
+
 PQ_TEXT = _pq_Format.TEXT
 PQ_BINARY = _pq_Format.BINARY
 
diff --git a/psycopg_c/psycopg_c/_psycopg/adapt.pyx b/psycopg_c/psycopg_c/_psycopg/adapt.pyx
index 5676fef25..8ea7910e9 100644
--- a/psycopg_c/psycopg_c/_psycopg/adapt.pyx
+++ b/psycopg_c/psycopg_c/_psycopg/adapt.pyx
@@ -26,9 +26,6 @@ from psycopg_c.pq cimport _buffer_as_string_and_size, Escaping
 from psycopg import errors as e
 from psycopg.pq.misc import error_message
 
-import logging
-logger = logging.getLogger("psycopg.adapt")
-
 
 @cython.freelist(8)
 cdef class CDumper:
diff --git a/psycopg_c/psycopg_c/_psycopg/generators.pyx b/psycopg_c/psycopg_c/_psycopg/generators.pyx
index e0a9a765a..b1fdfd1a1 100644
--- a/psycopg_c/psycopg_c/_psycopg/generators.pyx
+++ b/psycopg_c/psycopg_c/_psycopg/generators.pyx
@@ -6,7 +6,6 @@ C implementation of generators for the communication protocols with the libpq
 
 from cpython.object cimport PyObject_CallFunctionObjArgs
 
-import logging
 from typing import List
 
 from psycopg import errors as e
diff --git a/psycopg_c/psycopg_c/pq.pyx b/psycopg_c/psycopg_c/pq.pyx
index 0aabe353d..d397c1790 100644
--- a/psycopg_c/psycopg_c/pq.pyx
+++ b/psycopg_c/psycopg_c/pq.pyx
@@ -6,10 +6,14 @@ libpq Python wrapper using cython bindings.
 
 from psycopg_c.pq cimport libpq
 
+import logging
+
 from psycopg import errors as e
 from psycopg.pq import Format
 from psycopg.pq.misc import error_message
 
+logger = logging.getLogger("psycopg")
+
 __impl__ = 'c'
 __build_version__ = libpq.PG_VERSION_NUM
 
diff --git a/psycopg_c/psycopg_c/pq/pgconn.pyx b/psycopg_c/psycopg_c/pq/pgconn.pyx
index 513e2f9f4..d73ae9089 100644
--- a/psycopg_c/psycopg_c/pq/pgconn.pyx
+++ b/psycopg_c/psycopg_c/pq/pgconn.pyx
@@ -22,15 +22,12 @@ from cpython.mem cimport PyMem_Malloc, PyMem_Free
 from cpython.bytes cimport PyBytes_AsString
 from cpython.memoryview cimport PyMemoryView_FromObject
 
-import logging
 import sys
 
 from psycopg.pq import Format as PqFormat, Trace
 from psycopg.pq.misc import PGnotify, connection_summary
 from psycopg_c.pq cimport PQBuffer
 
-logger = logging.getLogger('psycopg')
-
 
 cdef class PGconn:
     @staticmethod
diff --git a/psycopg_c/psycopg_c/types/datetime.pyx b/psycopg_c/psycopg_c/types/datetime.pyx
index b7f01fbc7..50e5e1f28 100644
--- a/psycopg_c/psycopg_c/types/datetime.pyx
+++ b/psycopg_c/psycopg_c/types/datetime.pyx
@@ -1105,13 +1105,11 @@ cdef object _timezone_from_connection(pq.PGconn pgconn):
     try:
         zi = ZoneInfo(sname)
     except (KeyError, OSError):
-        logger = logging.getLogger("psycopg")
         logger.warning(
             "unknown PostgreSQL timezone: %r; will use UTC", sname
         )
         zi = timezone_utc
     except Exception as ex:
-        logger = logging.getLogger("psycopg")
         logger.warning(
             "error handling PostgreSQL timezone: %r; will use UTC (%s - %s)",
             sname,