From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sat, 13 Nov 2021 18:16:52 +0000 (+0100)
Subject: Fix segfault using timezones on Python 3.6 in -Werror mode
X-Git-Tag: 3.0.4~16^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bbe274496bd2d96e7e732ea6774b4b7b96856ce;p=thirdparty%2Fpsycopg.git

Fix segfault using timezones on Python 3.6 in -Werror mode

Also fix a couple of attribute errors in less used code paths (in the
branches reporting errors when using unsupported datestyles).

Related: https://github.com/pganssle/zoneinfo/issues/109
---

diff --git a/psycopg_c/psycopg_c/types/datetime.pyx b/psycopg_c/psycopg_c/types/datetime.pyx
index 99cc7db72..4f7d22576 100644
--- a/psycopg_c/psycopg_c/types/datetime.pyx
+++ b/psycopg_c/psycopg_c/types/datetime.pyx
@@ -808,7 +808,7 @@ cdef class TimestamptzLoader(_BaseTimestamptzLoader):
 
     cdef object _cload_notimpl(self, const char *data, size_t length):
         s = bytes(data)[:length].decode("utf8", "replace")
-        ds = _get_datestyle(self.connection).decode("ascii")
+        ds = _get_datestyle(self._pgconn).decode()
         raise NotImplementedError(
             f"can't parse timestamptz with DateStyle {ds!r}: {s!r}"
         )
@@ -965,7 +965,7 @@ cdef class IntervalLoader(CLoader):
 
     cdef object _cload_notimpl(self, const char *data, size_t length):
         s = bytes(data).decode("utf8", "replace")
-        style = _get_intervalstyle(self.connection).decode("ascii")
+        style = _get_intervalstyle(self._pgconn).decode()
         raise NotImplementedError(
             f"can't parse interval with IntervalStyle {style!r}: {s!r}"
         )
@@ -1118,7 +1118,12 @@ cdef object _timezone_from_connection(pq.PGconn pgconn, __cache={}):
     sname = tzname.decode() if tzname else "UTC"
     try:
         zi = ZoneInfo(sname)
-    except KeyError:
+    # Usually KeyError, but might be a DeprecationWarning raised by -Werror
+    # (experienced on Python 3.6.12, backport.zoneinfo 0.2.1).
+    # https://github.com/pganssle/zoneinfo/issues/109
+    # Curiously, not trapping the latter, causes a segfault.
+    # In such case the error message is wrong, but hey.
+    except Exception:
         logger = logging.getLogger("psycopg")
         logger.warning(
             "unknown PostgreSQL timezone: %r; will use UTC", sname