Improves timezone switching performances.

Author: sdispater

pendulum/_extensions/tz/_local_time.c pendulum/_extensions/_helpers.cpendulum/_extensions/tz/_local_time.c renamed to pendulum/_extensions/_helpers.c

@@ -2,6 +2,7 @@
 
 #include <Python.h>
 #include <stdint.h>
+#include <datetime.h>
 
 #ifndef PyVarObject_HEAD_INIT
 #define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
@@ -213,7 +214,7 @@ static PyMethodDef localtime_methods[] = {
 #if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
-    "_local_time",
+    "_helpers",
     NULL,
     -1,
     localtime_methods,
@@ -232,7 +233,7 @@ moduleinit(void)
 #if PY_MAJOR_VERSION >= 3
     module = PyModule_Create(&moduledef);
 #else
-    module = Py_InitModule3("_local_time", localtime_methods, NULL);
+    module = Py_InitModule3("_helpers", localtime_methods, NULL);
 #endif
 
     if (module == NULL)
@@ -242,12 +243,12 @@ moduleinit(void)
 }
 
 #if PY_MAJOR_VERSION < 3
-PyMODINIT_FUNC init_local_time(void)
+PyMODINIT_FUNC init_helpers(void)
 {
     moduleinit();
 }
 #else
-PyMODINIT_FUNC PyInit__local_time(void)
+PyMODINIT_FUNC PyInit__helpers(void)
 {
     return moduleinit();
 }

pendulum/_extensions/tz/local_time.py pendulum/_extensions/helpers.pypendulum/_extensions/tz/local_time.py renamed to pendulum/_extensions/helpers.py

@@ -1,33 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from .constants import SECONDS_PER_HOUR, SECONDS_PER_MINUTE
-
-
-def day_ordinal(y, m, d):
-    """
-    Returns the number of days before/after 1970-01-01.
-
-    :rtype: integer
-    """
-    if m <= 2:
-        y -= 1
-
-    era = (y if y >= 0 else y - 399) // 400
-    yoe = y - era * 400
-    doy = (153 * (m + (-3 if m > 2 else 9)) + 2) // 5 + d - 1
-    doe = yoe * 365 + yoe // 4 - yoe // 100 + doy
-
-    return era * 146097 + doe - 719468
-
-
-def timestamp(year, month, day, hour, minute, second, microsecond, tzinfo):
-    days_in_seconds = day_ordinal(year, month, day) * 86400
-
-    return (
-        days_in_seconds
-        + hour * SECONDS_PER_HOUR
-        + minute * SECONDS_PER_MINUTE
-        + second
-        + microsecond / 1e6
-        - tzinfo.offset
-    )
+try:
+    from ._extensions._helpers import local_time
+except ImportError:
+    from ._extensions.helpers import local_time

pendulum/_extensions/tz/__init__.py

@@ -17,7 +17,6 @@
 from .tz import Timezone, UTC, FixedTimezone, local_timezone
 from .tz.timezone_info import TimezoneInfo
 from .formatting import FORMATTERS
-from .helpers import timestamp
 from ._compat import basestring
 from .constants import (
     SUNDAY, MONDAY, TUESDAY, WEDNESDAY,
@@ -209,7 +208,7 @@ def instance(cls, dt, tz=UTC):
         tz = dt.tzinfo or tz
 
         # Checking for pytz/tzinfo
-        if isinstance(tz, datetime.tzinfo) and not isinstance(tz, TimezoneInfo):
+        if isinstance(tz, datetime.tzinfo) and not isinstance(tz, (Timezone, TimezoneInfo)):
             # pytz
             if hasattr(tz, 'localize'):
                 tz = tz.zone
@@ -279,7 +278,7 @@ def now(cls, tz=None):
             if tz is not None and tz != cls._test_now.timezone:
                 test_instance = test_instance.in_timezone(tz)
 
-            return test_instance.copy()
+            return test_instance
 
         if tz is None or tz == 'local':
             dt = datetime.datetime.now()
@@ -574,11 +573,7 @@ def timestamp(self):
     @property
     def float_timestamp(self):
         if self._timestamp is None:
-            self._timestamp = timestamp(
-                self._year, self._month, self._day,
-                self._hour, self._minute, self._second, self._microsecond,
-                self._tzinfo
-            )
+            self._timestamp = (self._datetime - self._EPOCH).total_seconds()
 
         return self._timestamp
 

pendulum/helpers.py

@@ -8,7 +8,7 @@
 from struct import unpack, calcsize
 
 from .. import _compat
-from .local_time import local_time
+from ..helpers import local_time
 from .transition import Transition
 from .transition_type import TransitionType
 
@@ -99,23 +99,27 @@ def _load(cls, fp):
             # calculate transition info
             transitions = tuple()
             for i in range(len(transition_times)):
-                transition_type = transition_types[lindexes[i]]
+                transition_type_index = lindexes[i]
 
                 if i == 0:
-                    pre_transition_type = transition_types[lindexes[i]]
+                    pre_transition_type_index = lindexes[i]
                 else:
-                    pre_transition_type = transition_types[lindexes[i - 1]]
+                    pre_transition_type_index = lindexes[i - 1]
 
-                pre_time = datetime(*local_time(transition_times[i],
-                                                pre_transition_type.utc_offset))
-                time = datetime(*local_time(transition_times[i],
-                                            transition_type.utc_offset))
+                pre_time = datetime(
+                    *local_time(transition_times[i],
+                                transition_types[pre_transition_type_index].utc_offset)
+                )
+                time = datetime(
+                    *local_time(transition_times[i],
+                                transition_types[transition_type_index].utc_offset)
+                )
                 tr = Transition(
                     transition_times[i],
-                    transition_type,
+                    transition_type_index,
                     pre_time,
                     time,
-                    pre_transition_type
+                    pre_transition_type_index
                 )
 
                 transitions += (tr,)
@@ -129,7 +133,7 @@ def _load(cls, fp):
                 while index != 0 and transition_types[index].is_dst:
                     index -= 1
 
-            while index != len(transitions) and transition_types[index].is_dst:
+            while index != len(transition_types) and transition_types[index].is_dst:
                 index += 1
 
             if index != len(transitions):
@@ -138,5 +142,6 @@ def _load(cls, fp):
         return (
             transitions,
             transition_types,
-            transition_types[default_transition_type_index]
+            default_transition_type_index,
+            tuple(map(lambda tr: datetime.utcfromtimestamp(tr.unix_time), transitions))
         )