Use zoneinfo as a base Timezone implementation

Author: sdispater

pendulum/_extensions/_helpers.c

@@ -165,7 +165,13 @@ char *_get_tz_name(PyObject *dt)
 
     if (tzinfo != Py_None)
     {
-        if (PyObject_HasAttrString(tzinfo, "name"))
+        if (PyObject_HasAttrString(tzinfo, "key"))
+        {
+            // zoneinfo timezone
+            tz = (char *)PyUnicode_AsUTF8(
+                PyObject_GetAttrString(tzinfo, "name"));
+        }
+        else if (PyObject_HasAttrString(tzinfo, "name"))
         {
             // Pendulum timezone
             tz = (char *)PyUnicode_AsUTF8(

pendulum/_extensions/helpers.py

@@ -197,6 +197,7 @@ def precise_diff(
 
     :rtype: PreciseDiff
     """
+    print("DT", d1, d2)
     sign = 1
 
     if d1 == d2:
@@ -234,14 +235,19 @@ def precise_diff(
     # Trying to figure out the timezone names
     # If we can't find them, we assume different timezones
     if tzinfo1 and tzinfo2:
-        if hasattr(tzinfo1, "name"):
+        if hasattr(tzinfo1, "key"):
+            # zoneinfo timezone
+            tz1 = tzinfo1.key
+        elif hasattr(tzinfo1, "name"):
             # Pendulum timezone
             tz1 = tzinfo1.name
         elif hasattr(tzinfo1, "zone"):
             # pytz timezone
             tz1 = tzinfo1.zone
 
-        if hasattr(tzinfo2, "name"):
+        if hasattr(tzinfo2, "key"):
+            tz2 = tzinfo2.key
+        elif hasattr(tzinfo2, "name"):
             tz2 = tzinfo2.name
         elif hasattr(tzinfo2, "zone"):
             tz2 = tzinfo2.zone

pendulum/tz/__init__.py

@@ -1,7 +1,9 @@
+import os
+
 from typing import Tuple
 from typing import Union
 
-import pytzdata
+import tzdata
 
 from .local_timezone import get_local_timezone
 from .local_timezone import set_local_timezone
@@ -15,13 +17,23 @@
 POST_TRANSITION = "post"
 TRANSITION_ERROR = "error"
 
-timezones = pytzdata.timezones  # type: Tuple[str, ...]
+_timezones = None
 
 
 _tz_cache = {}
 
 
-def timezone(name, extended=True):  # type: (Union[str, int], bool) -> _Timezone
+def timezones():
+    global _timezones
+
+    if _timezones is None:
+        with open(os.path.join(os.path.dirname(tzdata.__file__), "zones")) as f:
+            _timezones = tuple(tz.strip() for tz in f.readlines())
+
+    return _timezones
+
+
+def timezone(name: str) -> _Timezone:
     """
     Return a Timezone instance given its name.
     """
@@ -31,13 +43,7 @@ def timezone(name, extended=True):  # type: (Union[str, int], bool) -> _Timezone
     if name.lower() == "utc":
         return UTC
 
-    if name in _tz_cache:
-        return _tz_cache[name]
-
-    tz = _Timezone(name, extended=extended)
-    _tz_cache[name] = tz
-
-    return tz
+    return _Timezone(name)
 
 
 def fixed_timezone(offset):  # type: (int) -> _FixedTimezone

pendulum/tz/exceptions.py

@@ -3,6 +3,11 @@ class TimezoneError(ValueError):
     pass
 
 
+class InvalidTimezone(TimezoneError):
+
+    pass
+
+
 class NonExistingTime(TimezoneError):
 
     message = "The datetime {} does not exist."

pendulum/tz/local_timezone.py

@@ -7,9 +7,10 @@
 from typing import Optional
 from typing import Union
 
+from pendulum.utils._compat import zoneinfo
+
 from .timezone import Timezone
 from .timezone import TimezoneFile
-from .zoneinfo.exceptions import InvalidTimezone
 
 
 try:
@@ -212,7 +213,7 @@ def _get_unix_timezone(_root="/"):  # type: (str) -> Timezone
 
                     try:
                         return Timezone(os.path.join(*tzpath))
-                    except InvalidTimezone:
+                    except zoneinfo.ZoneInfoNotFoundError:
                         pass
 
     # systemd distributions use symlinks that include the zone name,
@@ -227,7 +228,7 @@ def _get_unix_timezone(_root="/"):  # type: (str) -> Timezone
             tzpath.insert(0, parts.pop(0))
             try:
                 return Timezone(os.path.join(*tzpath))
-            except InvalidTimezone:
+            except zoneinfo.ZoneInfoNotFoundError:
                 pass
 
     # No explicit setting existed. Use localtime