Fix usage of zoneinfo timezones

Author: sdispater

clock

@@ -16,9 +16,9 @@ from babel.plural import _binary_compiler
 from babel.plural import _GettextCompiler
 from babel.plural import _unary_compiler
 from babel.plural import compile_zero
-from cleo import Application
-from cleo import Command
-from cleo import argument
+from cleo.application import Application
+from cleo.commands.command import Command
+from cleo.helpers import argument
 
 from pendulum import __version__
 
@@ -47,7 +47,7 @@ class _LambdaCompiler(_GettextCompiler):
 
 class LocaleCreate(Command):
 
-    name = "create"
+    name = "locale create"
     description = "Creates locale translations."
 
     arguments = [argument("locales", "Locales to dump.", optional=False, multiple=True)]
@@ -236,7 +236,7 @@ translations = {{}}
 
 class LocaleRecreate(Command):
 
-    name = "recreate"
+    name = "locale recreate"
     description = "Recreate existing locales."
 
     def handle(self):
@@ -249,20 +249,9 @@ class LocaleRecreate(Command):
         self.call("locale:create", [("locales", locales)])
 
 
-class LocaleCommand(Command):
-
-    name = "locale"
-    description = "Locale related commands."
-
-    commands = [LocaleCreate()]
-
-    def handle(self):
-        self.call("help", self._config.name)
-
-
 class WindowsTzDump(Command):
 
-    name = "dump-timezones"
+    name = "windows dump-timezones"
     description = "Dumps the mapping of Windows timezones to IANA timezones."
 
     MAPPING_DIR = os.path.join("pendulum", "tz", "data")
@@ -281,21 +270,14 @@ class WindowsTzDump(Command):
         with open(os.path.join(self.MAPPING_DIR, "windows.py"), "w") as f:
             f.write(mapping)
 
-
-class WindowsCommand(Command):
-
-    name = "windows"
-    description = "Windows related commands."
-
-    commands = [WindowsTzDump()]
-
     def handle(self):
         self.call("help", self._config.name)
 
 
 app = Application("clock", __version__)
-app.add(LocaleCommand())
-app.add(WindowsCommand())
+app.add(LocaleCreate())
+app.add(LocaleRecreate())
+app.add(WindowsTzDump())
 
 
 if __name__ == "__main__":

pendulum/__init__.py

@@ -101,18 +101,21 @@ def datetime(
     second: int = 0,
     microsecond: int = 0,
     tz: Optional[Union[str, float, Timezone]] = UTC,
-    dst_rule: str = POST_TRANSITION,
+    fold: Optional[int] = 1,
+    raise_on_unknown_times: bool = False,
 ) -> DateTime:
     """
     Creates a new DateTime instance from a specific date and time.
     """
     if tz is not None:
         tz = _safe_timezone(tz)
 
-    dt = _datetime.datetime(year, month, day, hour, minute, second, microsecond)
+    dt = _datetime.datetime(
+        year, month, day, hour, minute, second, microsecond, fold=fold
+    )
 
     if tz is not None:
-        dt = tz.convert(dt, dst_rule=dst_rule)
+        dt = tz.convert(dt, raise_on_unknown_times=raise_on_unknown_times)
 
     return DateTime(
         dt.year,
@@ -152,11 +155,12 @@ def naive(
     minute: int = 0,
     second: int = 0,
     microsecond: int = 0,
+    fold: Optional[int] = 1,
 ) -> DateTime:
     """
     Return a naive DateTime.
     """
-    return DateTime(year, month, day, hour, minute, second, microsecond)
+    return DateTime(year, month, day, hour, minute, second, microsecond, fold=fold)
 
 
 def date(year: int, month: int, day: int) -> Date:
@@ -223,7 +227,7 @@ def now(tz: Optional[Union[str, Timezone]] = None) -> DateTime:
     else:
         dt = _datetime.datetime.now(UTC)
         tz = _safe_timezone(tz)
-        dt = tz.convert(dt)
+        dt = dt.astimezone(tz)
 
     return DateTime(
         dt.year,

pendulum/_extensions/helpers.py

@@ -197,7 +197,6 @@ def precise_diff(
 
     :rtype: PreciseDiff
     """
-    print("DT", d1, d2)
     sign = 1
 
     if d1 == d2:

pendulum/datetime.py

@@ -175,11 +175,11 @@ def tz(self) -> Optional[Timezone]:
         return self.timezone
 
     @property
-    def timezone_name(self) -> str:
+    def timezone_name(self) -> Optional[str]:
         tz = self.timezone
 
         if tz is None:
-            return None
+            return
 
         return tz.name
 
@@ -191,7 +191,7 @@ def is_local(self) -> bool:
         return self.offset == self.in_timezone(pendulum.local_timezone()).offset
 
     def is_utc(self) -> bool:
-        return self.offset == UTC.offset
+        return self.offset == 0
 
     def is_dst(self) -> bool:
         return self.dst() != datetime.timedelta()
@@ -241,7 +241,11 @@ def in_timezone(self, tz: Union[str, Timezone]) -> "DateTime":
         """
         tz = pendulum._safe_timezone(tz)
 
-        return tz.convert(self, dst_rule=pendulum.POST_TRANSITION)
+        dt = self
+        if not self.timezone:
+            dt = dt.replace(fold=1)
+
+        return tz.convert(dt)
 
     def in_tz(self, tz: Union[str, Timezone]) -> "DateTime":
         """
@@ -377,7 +381,7 @@ def __repr__(self) -> str:
             minute=self.minute,
             second=self.second,
             us=us,
-            tzinfo=self.tzinfo,
+            tzinfo=repr(self.tzinfo),
         )
 
     # Comparisons
@@ -469,8 +473,7 @@ def add(
         Add a duration to the instance.
 
         If we're adding units of variable length (i.e., years, months),
-        move forward from curren time,
-        otherwise move forward from utc, for accuracy
+        move forward from current time, otherwise move forward from utc, for accuracy
         when moving across DST boundaries.
         """
         units_of_variable_length = any([years, months, weeks, days])
@@ -1170,7 +1173,19 @@ def combine(cls, date: datetime.date, time: datetime.time) -> "DateTime":
         return pendulum.instance(datetime.datetime.combine(date, time), tz=None)
 
     def astimezone(self, tz: Optional[datetime.tzinfo] = None) -> "DateTime":
-        return pendulum.instance(super(DateTime, self).astimezone(tz))
+        dt = super().astimezone(tz)
+
+        return self.__class__(
+            dt.year,
+            dt.month,
+            dt.day,
+            dt.hour,
+            dt.minute,
+            dt.second,
+            dt.microsecond,
+            fold=dt.fold,
+            tzinfo=dt.tzinfo,
+        )
 
     def replace(
         self,
@@ -1203,22 +1218,8 @@ def replace(
         if fold is None:
             fold = self.fold
 
-        transition_rule = pendulum.POST_TRANSITION
-        if fold is not None:
-            transition_rule = pendulum.PRE_TRANSITION
-            if fold:
-                transition_rule = pendulum.POST_TRANSITION
-
         return pendulum.datetime(
-            year,
-            month,
-            day,
-            hour,
-            minute,
-            second,
-            microsecond,
-            tz=tzinfo,
-            dst_rule=transition_rule,
+            year, month, day, hour, minute, second, microsecond, tz=tzinfo, fold=fold
         )
 
     def __getnewargs__(self) -> Tuple:

pendulum/formatting/formatter.py

@@ -601,7 +601,7 @@ def _get_parsed_value(
             parsed["tz"] = pendulum.timezone(offset)
         elif token == "z":
             # Full timezone
-            if value not in pendulum.timezones:
+            if value not in pendulum.timezones():
                 raise ValueError("Invalid date")
 
             parsed["tz"] = pendulum.timezone(value)

pendulum/tz/local_timezone.py

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

pendulum/tz/timezone.py

@@ -8,6 +8,10 @@
 
 from pendulum.utils._compat import zoneinfo
 
+from .exceptions import AmbiguousTime
+from .exceptions import InvalidTimezone
+from .exceptions import NonExistingTime
+
 
 POST_TRANSITION = "post"
 PRE_TRANSITION = "pre"
@@ -51,11 +55,17 @@ class Timezone(zoneinfo.ZoneInfo, PendulumTimezone):
     >>> tz = Timezone('Europe/Paris')
     """
 
+    def __new__(cls, key: str) -> "Timezone":
+        try:
+            return super().__new__(cls, key)
+        except zoneinfo.ZoneInfoNotFoundError:
+            raise InvalidTimezone(key)
+
     @property
     def name(self) -> str:
         return self.key
 
-    def convert(self, dt: datetime, dst_rule: Optional[str] = None) -> datetime:
+    def convert(self, dt: datetime, raise_on_unknown_times: bool = False) -> datetime:
         """
         Converts a datetime in the current timezone.
 
@@ -76,14 +86,30 @@ def convert(self, dt: datetime, dst_rule: Optional[str] = None) -> datetime:
         >>> in_new_york.isoformat()
         '2013-03-30T21:30:00-04:00'
         """
-        if dst_rule is not None:
-            if dst_rule == PRE_TRANSITION and dt.fold != 0:
-                dt = dt.replace(fold=0)
-            elif dst_rule == POST_TRANSITION and dt.fold != 1:
-                dt = dt.replace(fold=1)
-
         if dt.tzinfo is None:
-            dt = dt.replace(tzinfo=self)
+            offset_before = (
+                self.utcoffset(dt.replace(fold=0)) if dt.fold else self.utcoffset(dt)
+            )
+            offset_after = (
+                self.utcoffset(dt) if dt.fold else self.utcoffset(dt.replace(fold=1))
+            )
+
+            if offset_after > offset_before:
+                # Skipped time
+                if raise_on_unknown_times:
+                    raise NonExistingTime(dt)
+
+                dt += (
+                    (offset_after - offset_before)
+                    if dt.fold
+                    else (offset_before - offset_after)
+                )
+            elif offset_before > offset_after:
+                # Repeated time
+                if raise_on_unknown_times:
+                    raise AmbiguousTime(dt)
+
+            return dt.replace(tzinfo=self)
 
         return dt.astimezone(self)
 
@@ -100,10 +126,13 @@ def datetime(
         """
         Return a normalized datetime for the current timezone.
         """
-        return datetime(
-            year, month, day, hour, minute, second, microsecond, tzinfo=self, fold=1
+        return self.convert(
+            datetime(year, month, day, hour, minute, second, microsecond, fold=1)
         )
 
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}('{self.name}')"
+
 
 class FixedTimezone(tzinfo, PendulumTimezone):
     def __init__(self, offset: int, name: Optional[str] = None) -> None:
@@ -123,7 +152,7 @@ def __init__(self, offset: int, name: Optional[str] = None) -> None:
     def name(self) -> str:
         return self._name
 
-    def convert(self, dt: datetime, dst_rule: Optional[str] = None) -> datetime:
+    def convert(self, dt: datetime, raise_on_unknown_times: bool = False) -> datetime:
         if dt.tzinfo is None:
             return dt.__class__(
                 dt.year,
@@ -137,12 +166,6 @@ def convert(self, dt: datetime, dst_rule: Optional[str] = None) -> datetime:
                 fold=0,
             )
 
-        if dst_rule is not None:
-            if dst_rule == PRE_TRANSITION and dt.fold != 0:
-                dt = dt.replace(fold=0)
-            elif dst_rule == POST_TRANSITION and dt.fold != 1:
-                dt = dt.replace(fold=1)
-
         return dt.astimezone(self)
 
     def datetime(
@@ -179,5 +202,12 @@ def tzname(self, dt: Optional[datetime]) -> Optional[str]:
     def __getinitargs__(self):  # type: () -> tuple
         return self._offset, self._name
 
+    def __repr__(self) -> str:
+        name = ""
+        if self._name:
+            name = f', name="{self._name}"'
+
+        return f"{self.__class__.__name__}({self._offset}{name})"
+
 
-UTC = FixedTimezone(0, "UTC")
+UTC = Timezone("UTC")