mysqlengine 0.1.11.6__cp311-cp311-win_amd64.whl → 0.1.11.7__cp311-cp311-win_amd64.whl

mysqlengine/utils.c

@@ -10,7 +10,7 @@
             ]
         ],
         "include_dirs": [
-            "C:\\Users\\runneradmin\\AppData\\Local\\Temp\\pip-build-env-s71fkjmu\\overlay\\Lib\\site-packages\\numpy\\core\\include"
+            "C:\\Users\\runneradmin\\AppData\\Local\\Temp\\pip-build-env-o1tb4bhz\\overlay\\Lib\\site-packages\\numpy\\core\\include"
         ],
         "name": "mysqlengine.utils",
         "sources": [
@@ -1581,7 +1581,7 @@ static const char *__pyx_f[] = {
 
 /* #### Code section: numeric_typedefs ### */
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":730
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":730
  * # in Cython to enable them only on the right systems.
  * 
  * ctypedef npy_int8       int8_t             # <<<<<<<<<<<<<<
@@ -1590,7 +1590,7 @@ static const char *__pyx_f[] = {
  */
 typedef npy_int8 __pyx_t_5numpy_int8_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":731
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":731
  * 
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t             # <<<<<<<<<<<<<<
@@ -1599,7 +1599,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
  */
 typedef npy_int16 __pyx_t_5numpy_int16_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":732
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":732
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t             # <<<<<<<<<<<<<<
@@ -1608,7 +1608,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t;
  */
 typedef npy_int32 __pyx_t_5numpy_int32_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":733
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":733
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t
  * ctypedef npy_int64      int64_t             # <<<<<<<<<<<<<<
@@ -1617,7 +1617,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t;
  */
 typedef npy_int64 __pyx_t_5numpy_int64_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":737
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":737
  * #ctypedef npy_int128     int128_t
  * 
  * ctypedef npy_uint8      uint8_t             # <<<<<<<<<<<<<<
@@ -1626,7 +1626,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t;
  */
 typedef npy_uint8 __pyx_t_5numpy_uint8_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":738
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":738
  * 
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t             # <<<<<<<<<<<<<<
@@ -1635,7 +1635,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t;
  */
 typedef npy_uint16 __pyx_t_5numpy_uint16_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":739
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":739
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t             # <<<<<<<<<<<<<<
@@ -1644,7 +1644,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t;
  */
 typedef npy_uint32 __pyx_t_5numpy_uint32_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":740
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":740
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t
  * ctypedef npy_uint64     uint64_t             # <<<<<<<<<<<<<<
@@ -1653,7 +1653,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t;
  */
 typedef npy_uint64 __pyx_t_5numpy_uint64_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":744
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":744
  * #ctypedef npy_uint128    uint128_t
  * 
  * ctypedef npy_float32    float32_t             # <<<<<<<<<<<<<<
@@ -1662,7 +1662,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t;
  */
 typedef npy_float32 __pyx_t_5numpy_float32_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":745
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":745
  * 
  * ctypedef npy_float32    float32_t
  * ctypedef npy_float64    float64_t             # <<<<<<<<<<<<<<
@@ -1671,7 +1671,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t;
  */
 typedef npy_float64 __pyx_t_5numpy_float64_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":754
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":754
  * # The int types are mapped a bit surprising --
  * # numpy.int corresponds to 'l' and numpy.long to 'q'
  * ctypedef npy_long       int_t             # <<<<<<<<<<<<<<
@@ -1680,7 +1680,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t;
  */
 typedef npy_long __pyx_t_5numpy_int_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":755
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":755
  * # numpy.int corresponds to 'l' and numpy.long to 'q'
  * ctypedef npy_long       int_t
  * ctypedef npy_longlong   longlong_t             # <<<<<<<<<<<<<<
@@ -1689,7 +1689,7 @@ typedef npy_long __pyx_t_5numpy_int_t;
  */
 typedef npy_longlong __pyx_t_5numpy_longlong_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":757
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":757
  * ctypedef npy_longlong   longlong_t
  * 
  * ctypedef npy_ulong      uint_t             # <<<<<<<<<<<<<<
@@ -1698,7 +1698,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t;
  */
 typedef npy_ulong __pyx_t_5numpy_uint_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":758
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":758
  * 
  * ctypedef npy_ulong      uint_t
  * ctypedef npy_ulonglong  ulonglong_t             # <<<<<<<<<<<<<<
@@ -1707,7 +1707,7 @@ typedef npy_ulong __pyx_t_5numpy_uint_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":760
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":760
  * ctypedef npy_ulonglong  ulonglong_t
  * 
  * ctypedef npy_intp       intp_t             # <<<<<<<<<<<<<<
@@ -1716,7 +1716,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
  */
 typedef npy_intp __pyx_t_5numpy_intp_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":761
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":761
  * 
  * ctypedef npy_intp       intp_t
  * ctypedef npy_uintp      uintp_t             # <<<<<<<<<<<<<<
@@ -1725,7 +1725,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
  */
 typedef npy_uintp __pyx_t_5numpy_uintp_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":763
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":763
  * ctypedef npy_uintp      uintp_t
  * 
  * ctypedef npy_double     float_t             # <<<<<<<<<<<<<<
@@ -1734,7 +1734,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t;
  */
 typedef npy_double __pyx_t_5numpy_float_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":764
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":764
  * 
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t             # <<<<<<<<<<<<<<
@@ -1743,7 +1743,7 @@ typedef npy_double __pyx_t_5numpy_float_t;
  */
 typedef npy_double __pyx_t_5numpy_double_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":765
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":765
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t
  * ctypedef npy_longdouble longdouble_t             # <<<<<<<<<<<<<<
@@ -1809,7 +1809,7 @@ struct __pyx_opt_args_7cpython_11contextvars_get_value_no_default {
   PyObject *default_value;
 };
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":767
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":767
  * ctypedef npy_longdouble longdouble_t
  * 
  * ctypedef npy_cfloat      cfloat_t             # <<<<<<<<<<<<<<
@@ -1818,7 +1818,7 @@ struct __pyx_opt_args_7cpython_11contextvars_get_value_no_default {
  */
 typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":768
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":768
  * 
  * ctypedef npy_cfloat      cfloat_t
  * ctypedef npy_cdouble     cdouble_t             # <<<<<<<<<<<<<<
@@ -1827,7 +1827,7 @@ typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
  */
 typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":769
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":769
  * ctypedef npy_cfloat      cfloat_t
  * ctypedef npy_cdouble     cdouble_t
  * ctypedef npy_clongdouble clongdouble_t             # <<<<<<<<<<<<<<
@@ -1836,7 +1836,7 @@ typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
  */
 typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t;
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":771
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":771
  * ctypedef npy_clongdouble clongdouble_t
  * 
  * ctypedef npy_cdouble     complex_t             # <<<<<<<<<<<<<<
@@ -1965,7 +1965,7 @@ struct __pyx_t_7cytimes_10cydatetime_iso {
  * cdef long long localize_timestamp(double timestamp) except *
  * # Date
  * cdef datetime.date gen_date(int year=?, int month=?, int day=?) except *             # <<<<<<<<<<<<<<
- * cdef datetime.date gen_date_local() noexcept
+ * cdef datetime.date gen_date_now() noexcept
  * cdef long long date_mktime(datetime.date date) except *
  */
 struct __pyx_opt_args_7cytimes_10cydatetime_gen_date {
@@ -2007,8 +2007,8 @@ struct __pyx_opt_args_7cytimes_10cydatetime_date_replace {
  * cdef datetime.date date_replace(datetime.date date, int year=?, int month=?, int day=?) noexcept
  * # Datetime
  * cdef datetime.datetime gen_dt(int year=?, int month=?, int day=?, int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) except *             # <<<<<<<<<<<<<<
- * cdef datetime.datetime gen_dt_local() noexcept
- * cdef long long dt_mktime(datetime.datetime dt) except *
+ * cdef datetime.datetime gen_dt_now() noexcept
+ * cdef datetime.datetime gen_dt_utcnow() noexcept
  */
 struct __pyx_opt_args_7cytimes_10cydatetime_gen_dt {
   int __pyx_n;
@@ -2023,7 +2023,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_gen_dt {
   int fold;
 };
 
-/* "cydatetime.pxd":137
+/* "cydatetime.pxd":138
  * cdef datetime.datetime dt_fr_date_time(datetime.date date, datetime.time time) noexcept
  * cdef datetime.datetime dt_fr_ordinal(int ordinal) noexcept
  * cdef datetime.datetime dt_fr_seconds(double seconds, object tzinfo=?, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2036,7 +2036,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_dt_fr_seconds {
   int fold;
 };
 
-/* "cydatetime.pxd":138
+/* "cydatetime.pxd":139
  * cdef datetime.datetime dt_fr_ordinal(int ordinal) noexcept
  * cdef datetime.datetime dt_fr_seconds(double seconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.datetime dt_fr_microseconds(long long microseconds, object tzinfo=?, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2049,7 +2049,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_dt_fr_microseconds {
   int fold;
 };
 
-/* "cydatetime.pxd":139
+/* "cydatetime.pxd":140
  * cdef datetime.datetime dt_fr_seconds(double seconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.datetime dt_fr_microseconds(long long microseconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.datetime dt_fr_timestamp(double timestamp, object tzinfo=?) except *             # <<<<<<<<<<<<<<
@@ -2061,7 +2061,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_dt_fr_timestamp {
   PyObject *tzinfo;
 };
 
-/* "cydatetime.pxd":140
+/* "cydatetime.pxd":141
  * cdef datetime.datetime dt_fr_microseconds(long long microseconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.datetime dt_fr_timestamp(double timestamp, object tzinfo=?) except *
  * cdef datetime.datetime dt_add(datetime.datetime dt, int days=?, long long seconds=?, long long microseconds=?) noexcept             # <<<<<<<<<<<<<<
@@ -2075,7 +2075,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_dt_add {
   PY_LONG_LONG microseconds;
 };
 
-/* "cydatetime.pxd":144
+/* "cydatetime.pxd":145
  * cdef datetime.timedelta dt_sub_dt(datetime.datetime dt_l, datetime.datetime dt_r) noexcept
  * cdef long long dt_sub_dt_microseconds(datetime.datetime dt_l, datetime.datetime dt_r) noexcept
  * cdef datetime.datetime dt_replace(datetime.datetime dt, int year=?, int month=?, int day=?, int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2095,7 +2095,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_dt_replace {
   int fold;
 };
 
-/* "cydatetime.pxd":145
+/* "cydatetime.pxd":146
  * cdef long long dt_sub_dt_microseconds(datetime.datetime dt_l, datetime.datetime dt_r) noexcept
  * cdef datetime.datetime dt_replace(datetime.datetime dt, int year=?, int month=?, int day=?, int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.datetime dt_replace_tzinfo(datetime.datetime dt, object tzinfo=?) noexcept             # <<<<<<<<<<<<<<
@@ -2107,7 +2107,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_dt_replace_tzinfo {
   PyObject *tzinfo;
 };
 
-/* "cydatetime.pxd":146
+/* "cydatetime.pxd":147
  * cdef datetime.datetime dt_replace(datetime.datetime dt, int year=?, int month=?, int day=?, int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.datetime dt_replace_tzinfo(datetime.datetime dt, object tzinfo=?) noexcept
  * cdef datetime.datetime dt_replace_fold(datetime.datetime dt, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2119,12 +2119,12 @@ struct __pyx_opt_args_7cytimes_10cydatetime_dt_replace_fold {
   int fold;
 };
 
-/* "cydatetime.pxd":148
+/* "cydatetime.pxd":149
  * cdef datetime.datetime dt_replace_fold(datetime.datetime dt, int fold=?) noexcept
  * # Datetime.Time
  * cdef datetime.time gen_time(int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) except *             # <<<<<<<<<<<<<<
- * cdef datetime.time gen_time_local() noexcept
- * cdef bint is_time(object obj) except -1
+ * cdef datetime.time gen_time_now() noexcept
+ * cdef datetime.time gen_time_utcnow() noexcept
  */
 struct __pyx_opt_args_7cytimes_10cydatetime_gen_time {
   int __pyx_n;
@@ -2136,7 +2136,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_gen_time {
   int fold;
 };
 
-/* "cydatetime.pxd":164
+/* "cydatetime.pxd":166
  * cdef datetime.time time_fr_dt(datetime.datetime dt) noexcept
  * cdef datetime.time time_fr_dt_tz(datetime.datetime dt) noexcept
  * cdef datetime.time time_fr_seconds(double seconds, object tzinfo=?, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2149,7 +2149,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_time_fr_seconds {
   int fold;
 };
 
-/* "cydatetime.pxd":165
+/* "cydatetime.pxd":167
  * cdef datetime.time time_fr_dt_tz(datetime.datetime dt) noexcept
  * cdef datetime.time time_fr_seconds(double seconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.time time_fr_microseconds(long long microseconds, object tzinfo=?, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2162,7 +2162,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_time_fr_microseconds {
   int fold;
 };
 
-/* "cydatetime.pxd":166
+/* "cydatetime.pxd":168
  * cdef datetime.time time_fr_seconds(double seconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.time time_fr_microseconds(long long microseconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.time time_replace(datetime.time time, int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2179,7 +2179,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_time_replace {
   int fold;
 };
 
-/* "cydatetime.pxd":167
+/* "cydatetime.pxd":169
  * cdef datetime.time time_fr_microseconds(long long microseconds, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.time time_replace(datetime.time time, int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.time time_replace_tzinfo(datetime.time time, object tzinfo=?) noexcept             # <<<<<<<<<<<<<<
@@ -2191,7 +2191,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_time_replace_tzinfo {
   PyObject *tzinfo;
 };
 
-/* "cydatetime.pxd":168
+/* "cydatetime.pxd":170
  * cdef datetime.time time_replace(datetime.time time, int hour=?, int minute=?, int second=?, int microsecond=?, object tzinfo=?, int fold=?) noexcept
  * cdef datetime.time time_replace_tzinfo(datetime.time time, object tzinfo=?) noexcept
  * cdef datetime.time time_replace_fold(datetime.time time, int fold=?) noexcept             # <<<<<<<<<<<<<<
@@ -2203,7 +2203,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_time_replace_fold {
   int fold;
 };
 
-/* "cydatetime.pxd":170
+/* "cydatetime.pxd":172
  * cdef datetime.time time_replace_fold(datetime.time time, int fold=?) noexcept
  * # Timedelta
  * cdef datetime.timedelta gen_delta(int days=?, long long seconds=?, long long microseconds=?) except *             # <<<<<<<<<<<<<<
@@ -2217,7 +2217,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_gen_delta {
   PY_LONG_LONG microseconds;
 };
 
-/* "cydatetime.pxd":182
+/* "cydatetime.pxd":184
  * cdef datetime.timedelta delta_fr_seconds(double seconds) noexcept
  * cdef datetime.timedelta delta_fr_microseconds(long long microseconds) noexcept
  * cdef datetime.timedelta delta_add(datetime.timedelta delta, int days=?, long long seconds=?, long long microseconds=?) noexcept             # <<<<<<<<<<<<<<
@@ -2231,7 +2231,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_delta_add {
   PY_LONG_LONG microseconds;
 };
 
-/* "cydatetime.pxd":186
+/* "cydatetime.pxd":188
  * cdef datetime.timedelta delta_sub_delta(datetime.timedelta delta_l, datetime.timedelta delta_r) noexcept
  * # Timezone
  * cdef datetime.tzinfo gen_timezone(int offset_seconds, str tzname=?) except *             # <<<<<<<<<<<<<<
@@ -2243,7 +2243,7 @@ struct __pyx_opt_args_7cytimes_10cydatetime_gen_timezone {
   PyObject *tzname;
 };
 
-/* "cydatetime.pxd":187
+/* "cydatetime.pxd":189
  * # Timezone
  * cdef datetime.tzinfo gen_timezone(int offset_seconds, str tzname=?) except *
  * cdef datetime.tzinfo gen_timezone_local(datetime.datetime dt=?) except *             # <<<<<<<<<<<<<<
@@ -3788,7 +3788,6 @@ static PY_LONG_LONG *__pyx_vp_7cytimes_10cydatetime_HOUR_DAY = 0;
 static PY_LONG_LONG *__pyx_vp_7cytimes_10cydatetime_HOUR_HOUR = 0;
 #define __pyx_v_7cytimes_10cydatetime_HOUR_HOUR (*__pyx_vp_7cytimes_10cydatetime_HOUR_HOUR)
 static int (*__pyx_f_7cytimes_10cydatetime_get_year)(PyObject *); /*proto*/
-static PyDateTime_DateTime *(*__pyx_f_7cytimes_10cydatetime_gen_dt_local)(void); /*proto*/
 static PyDateTime_DateTime *(*__pyx_f_7cytimes_10cydatetime_dt_add)(PyDateTime_DateTime *, struct __pyx_opt_args_7cytimes_10cydatetime_dt_add *__pyx_optional_args); /*proto*/
 static PyDateTime_DateTime *(*__pyx_f_7cytimes_10cydatetime_dt_replace)(PyDateTime_DateTime *, struct __pyx_opt_args_7cytimes_10cydatetime_dt_replace *__pyx_optional_args); /*proto*/
 
@@ -3947,6 +3946,7 @@ static const char __pyx_k_raise_error[] = "raise_error";
 static const char __pyx_k_str_replace[] = "str_replace";
 static const char __pyx_k_RuntimeError[] = "RuntimeError";
 static const char __pyx_k_cytimes_pydt[] = "cytimes.pydt";
+static const char __pyx_k_gen_dt_local[] = "gen_dt_local";
 static const char __pyx_k_initializing[] = "_initializing";
 static const char __pyx_k_is_coroutine[] = "_is_coroutine";
 static const char __pyx_k_parse_dtypes[] = "parse_dtypes";
@@ -4240,6 +4240,7 @@ typedef struct {
   PyObject *__pyx_n_s_findall;
   PyObject *__pyx_n_s_float;
   PyObject *__pyx_n_s_format;
+  PyObject *__pyx_n_s_gen_dt_local;
   PyObject *__pyx_n_s_gen_time_span;
   PyObject *__pyx_kp_u_gen_time_span_Invalid_unit;
   PyObject *__pyx_kp_u_gen_time_span_Must_provide_as_l;
@@ -4508,6 +4509,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_findall);
   Py_CLEAR(clear_module_state->__pyx_n_s_float);
   Py_CLEAR(clear_module_state->__pyx_n_s_format);
+  Py_CLEAR(clear_module_state->__pyx_n_s_gen_dt_local);
   Py_CLEAR(clear_module_state->__pyx_n_s_gen_time_span);
   Py_CLEAR(clear_module_state->__pyx_kp_u_gen_time_span_Invalid_unit);
   Py_CLEAR(clear_module_state->__pyx_kp_u_gen_time_span_Must_provide_as_l);
@@ -4754,6 +4756,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_findall);
   Py_VISIT(traverse_module_state->__pyx_n_s_float);
   Py_VISIT(traverse_module_state->__pyx_n_s_format);
+  Py_VISIT(traverse_module_state->__pyx_n_s_gen_dt_local);
   Py_VISIT(traverse_module_state->__pyx_n_s_gen_time_span);
   Py_VISIT(traverse_module_state->__pyx_kp_u_gen_time_span_Invalid_unit);
   Py_VISIT(traverse_module_state->__pyx_kp_u_gen_time_span_Must_provide_as_l);
@@ -5114,6 +5117,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_findall __pyx_mstate_global->__pyx_n_s_findall
 #define __pyx_n_s_float __pyx_mstate_global->__pyx_n_s_float
 #define __pyx_n_s_format __pyx_mstate_global->__pyx_n_s_format
+#define __pyx_n_s_gen_dt_local __pyx_mstate_global->__pyx_n_s_gen_dt_local
 #define __pyx_n_s_gen_time_span __pyx_mstate_global->__pyx_n_s_gen_time_span
 #define __pyx_kp_u_gen_time_span_Invalid_unit __pyx_mstate_global->__pyx_kp_u_gen_time_span_Invalid_unit
 #define __pyx_kp_u_gen_time_span_Must_provide_as_l __pyx_mstate_global->__pyx_kp_u_gen_time_span_Must_provide_as_l
@@ -5251,7 +5255,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_codeobj__52 __pyx_mstate_global->__pyx_codeobj__52
 /* #### Code section: module_code ### */
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":245
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":245
  * 
  *         @property
  *         cdef inline PyObject* base(self) nogil:             # <<<<<<<<<<<<<<
@@ -5262,7 +5266,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject *__pyx_v_self) {
   PyObject *__pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":248
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":248
  *             """Returns a borrowed reference to the object owning the data/memory.
  *             """
  *             return PyArray_BASE(self)             # <<<<<<<<<<<<<<
@@ -5272,7 +5276,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   __pyx_r = PyArray_BASE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":245
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":245
  * 
  *         @property
  *         cdef inline PyObject* base(self) nogil:             # <<<<<<<<<<<<<<
@@ -5285,7 +5289,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":251
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":251
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -5299,7 +5303,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   PyArray_Descr *__pyx_t_1;
   __Pyx_RefNannySetupContext("descr", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":254
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":254
  *             """Returns an owned reference to the dtype of the array.
  *             """
  *             return <dtype>PyArray_DESCR(self)             # <<<<<<<<<<<<<<
@@ -5312,7 +5316,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   __pyx_r = ((PyArray_Descr *)__pyx_t_1);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":251
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":251
  * 
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -5327,7 +5331,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":257
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":257
  * 
  *         @property
  *         cdef inline int ndim(self) nogil:             # <<<<<<<<<<<<<<
@@ -5338,7 +5342,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
 static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx_v_self) {
   int __pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":260
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":260
  *             """Returns the number of dimensions in the array.
  *             """
  *             return PyArray_NDIM(self)             # <<<<<<<<<<<<<<
@@ -5348,7 +5352,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   __pyx_r = PyArray_NDIM(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":257
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":257
  * 
  *         @property
  *         cdef inline int ndim(self) nogil:             # <<<<<<<<<<<<<<
@@ -5361,7 +5365,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":263
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":263
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) nogil:             # <<<<<<<<<<<<<<
@@ -5372,7 +5376,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":268
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":268
  *             Can return NULL for 0-dimensional arrays.
  *             """
  *             return PyArray_DIMS(self)             # <<<<<<<<<<<<<<
@@ -5382,7 +5386,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   __pyx_r = PyArray_DIMS(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":263
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":263
  * 
  *         @property
  *         cdef inline npy_intp *shape(self) nogil:             # <<<<<<<<<<<<<<
@@ -5395,7 +5399,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":271
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":271
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) nogil:             # <<<<<<<<<<<<<<
@@ -5406,7 +5410,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
 static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayObject *__pyx_v_self) {
   npy_intp *__pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":275
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":275
  *             The number of elements matches the number of dimensions of the array (ndim).
  *             """
  *             return PyArray_STRIDES(self)             # <<<<<<<<<<<<<<
@@ -5416,7 +5420,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   __pyx_r = PyArray_STRIDES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":271
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":271
  * 
  *         @property
  *         cdef inline npy_intp *strides(self) nogil:             # <<<<<<<<<<<<<<
@@ -5429,7 +5433,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":278
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":278
  * 
  *         @property
  *         cdef inline npy_intp size(self) nogil:             # <<<<<<<<<<<<<<
@@ -5440,7 +5444,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
 static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *__pyx_v_self) {
   npy_intp __pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":281
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":281
  *             """Returns the total size (in number of elements) of the array.
  *             """
  *             return PyArray_SIZE(self)             # <<<<<<<<<<<<<<
@@ -5450,7 +5454,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   __pyx_r = PyArray_SIZE(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":278
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":278
  * 
  *         @property
  *         cdef inline npy_intp size(self) nogil:             # <<<<<<<<<<<<<<
@@ -5463,7 +5467,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":284
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":284
  * 
  *         @property
  *         cdef inline char* data(self) nogil:             # <<<<<<<<<<<<<<
@@ -5474,7 +5478,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
 static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__pyx_v_self) {
   char *__pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":290
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":290
  *             of `PyArray_DATA()` instead, which returns a 'void*'.
  *             """
  *             return PyArray_BYTES(self)             # <<<<<<<<<<<<<<
@@ -5484,7 +5488,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   __pyx_r = PyArray_BYTES(__pyx_v_self);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":284
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":284
  * 
  *         @property
  *         cdef inline char* data(self) nogil:             # <<<<<<<<<<<<<<
@@ -5497,7 +5501,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":773
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_cdouble     complex_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -5514,7 +5518,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":774
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":774
  * 
  * cdef inline object PyArray_MultiIterNew1(a):
  *     return PyArray_MultiIterNew(1, <void*>a)             # <<<<<<<<<<<<<<
@@ -5528,7 +5532,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":773
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_cdouble     complex_t
  * 
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -5547,7 +5551,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":776
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":776
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -5564,7 +5568,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":777
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":777
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)             # <<<<<<<<<<<<<<
@@ -5578,7 +5582,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":776
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":776
  *     return PyArray_MultiIterNew(1, <void*>a)
  * 
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -5597,7 +5601,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":779
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":779
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -5614,7 +5618,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":780
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":780
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)             # <<<<<<<<<<<<<<
@@ -5628,7 +5632,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":779
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":779
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  * 
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -5647,7 +5651,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":782
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":782
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -5664,7 +5668,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":783
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":783
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)             # <<<<<<<<<<<<<<
@@ -5678,7 +5682,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":782
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":782
  *     return PyArray_MultiIterNew(3, <void*>a, <void*>b, <void*> c)
  * 
  * cdef inline object PyArray_MultiIterNew4(a, b, c, d):             # <<<<<<<<<<<<<<
@@ -5697,7 +5701,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":785
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":785
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -5714,7 +5718,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":786
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":786
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)             # <<<<<<<<<<<<<<
@@ -5728,7 +5732,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":785
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":785
  *     return PyArray_MultiIterNew(4, <void*>a, <void*>b, <void*>c, <void*> d)
  * 
  * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e):             # <<<<<<<<<<<<<<
@@ -5747,7 +5751,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":788
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":788
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -5761,7 +5765,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":789
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":789
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -5771,7 +5775,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
   if (__pyx_t_1) {
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":790
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":790
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):
  *         return <tuple>d.subarray.shape             # <<<<<<<<<<<<<<
@@ -5783,7 +5787,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape);
     goto __pyx_L0;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":789
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":789
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -5792,7 +5796,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
  */
   }
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":792
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":792
  *         return <tuple>d.subarray.shape
  *     else:
  *         return ()             # <<<<<<<<<<<<<<
@@ -5806,7 +5810,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     goto __pyx_L0;
   }
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":788
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":788
  *     return PyArray_MultiIterNew(5, <void*>a, <void*>b, <void*>c, <void*> d, <void*> e)
  * 
  * cdef inline tuple PyDataType_SHAPE(dtype d):             # <<<<<<<<<<<<<<
@@ -5821,7 +5825,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":967
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":967
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base):             # <<<<<<<<<<<<<<
@@ -5835,7 +5839,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":968
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":968
  * 
  * cdef inline void set_array_base(ndarray arr, object base):
  *     Py_INCREF(base) # important to do this before stealing the reference below!             # <<<<<<<<<<<<<<
@@ -5844,7 +5848,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   Py_INCREF(__pyx_v_base);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":969
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":969
  * cdef inline void set_array_base(ndarray arr, object base):
  *     Py_INCREF(base) # important to do this before stealing the reference below!
  *     PyArray_SetBaseObject(arr, base)             # <<<<<<<<<<<<<<
@@ -5853,7 +5857,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   __pyx_t_1 = PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base); if (unlikely(__pyx_t_1 == ((int)-1))) __PYX_ERR(1, 969, __pyx_L1_error)
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":967
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":967
  *     int _import_umath() except -1
  * 
  * cdef inline void set_array_base(ndarray arr, object base):             # <<<<<<<<<<<<<<
@@ -5868,7 +5872,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   __pyx_L0:;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":971
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":971
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -5883,7 +5887,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_array_base", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":972
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":972
  * 
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)             # <<<<<<<<<<<<<<
@@ -5892,7 +5896,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   __pyx_v_base = PyArray_BASE(__pyx_v_arr);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":973
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":973
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -5902,7 +5906,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_t_1 = (__pyx_v_base == NULL);
   if (__pyx_t_1) {
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":974
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":974
  *     base = PyArray_BASE(arr)
  *     if base is NULL:
  *         return None             # <<<<<<<<<<<<<<
@@ -5913,7 +5917,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":973
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":973
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -5922,7 +5926,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   }
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":975
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":975
  *     if base is NULL:
  *         return None
  *     return <object>base             # <<<<<<<<<<<<<<
@@ -5934,7 +5938,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_r = ((PyObject *)__pyx_v_base);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":971
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":971
  *     PyArray_SetBaseObject(arr, base)
  * 
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -5949,7 +5953,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":979
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":979
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -5973,7 +5977,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_array", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":980
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":980
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5989,7 +5993,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":981
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":981
  * cdef inline int import_array() except -1:
  *     try:
  *         __pyx_import_array()             # <<<<<<<<<<<<<<
@@ -5998,7 +6002,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
  */
       __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 981, __pyx_L3_error)
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":980
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":980
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6012,7 +6016,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":982
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":982
  *     try:
  *         __pyx_import_array()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -6027,7 +6031,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":983
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":983
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy.core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -6042,7 +6046,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":980
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":980
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6058,7 +6062,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":979
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":979
  * # Versions of the import_* functions which are more suitable for
  * # Cython code.
  * cdef inline int import_array() except -1:             # <<<<<<<<<<<<<<
@@ -6081,7 +6085,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":985
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":985
  *         raise ImportError("numpy.core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -6105,7 +6109,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_umath", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":986
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":986
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6121,7 +6125,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":987
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":987
  * cdef inline int import_umath() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -6130,7 +6134,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 987, __pyx_L3_error)
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":986
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":986
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6144,7 +6148,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":988
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":988
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -6159,7 +6163,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":989
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":989
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -6174,7 +6178,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":986
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":986
  * 
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6190,7 +6194,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":985
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":985
  *         raise ImportError("numpy.core.multiarray failed to import")
  * 
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -6213,7 +6217,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":991
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":991
  *         raise ImportError("numpy.core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -6237,7 +6241,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_ufunc", 1);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":992
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":992
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6253,7 +6257,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":993
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":993
  * cdef inline int import_ufunc() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -6262,7 +6266,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
  */
       __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(1, 993, __pyx_L3_error)
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":992
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":992
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6276,7 +6280,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":994
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":994
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -6291,7 +6295,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
 
-      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":995
+      /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":995
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -6306,7 +6310,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     }
     goto __pyx_L5_except_error;
 
-    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":992
+    /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":992
  * 
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6322,7 +6326,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __pyx_L8_try_end:;
   }
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":991
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":991
  *         raise ImportError("numpy.core.umath failed to import")
  * 
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -6345,7 +6349,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":998
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":998
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6356,7 +6360,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
 static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1010
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1010
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type)             # <<<<<<<<<<<<<<
@@ -6366,7 +6370,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type));
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":998
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":998
  * 
  * 
  * cdef inline bint is_timedelta64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6379,7 +6383,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1013
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1013
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6390,7 +6394,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
 static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_obj) {
   int __pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1025
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1025
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type)             # <<<<<<<<<<<<<<
@@ -6400,7 +6404,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type));
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1013
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1013
  * 
  * 
  * cdef inline bint is_datetime64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6413,7 +6417,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1028
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1028
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6424,7 +6428,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
 static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) {
   npy_datetime __pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1035
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1035
  *     also needed.  That can be found using `get_datetime64_unit`.
  *     """
  *     return (<PyDatetimeScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -6434,7 +6438,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1028
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1028
  * 
  * 
  * cdef inline npy_datetime get_datetime64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6447,7 +6451,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1038
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1038
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6458,7 +6462,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
 static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) {
   npy_timedelta __pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1042
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1042
  *     returns the int64 value underlying scalar numpy timedelta64 object
  *     """
  *     return (<PyTimedeltaScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -6468,7 +6472,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1038
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1038
  * 
  * 
  * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6481,7 +6485,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   return __pyx_r;
 }
 
-/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1045
+/* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1045
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6492,7 +6496,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
 static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) {
   NPY_DATETIMEUNIT __pyx_r;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1049
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1049
  *     returns the unit part of the dtype for a numpy datetime64 object.
  *     """
  *     return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base             # <<<<<<<<<<<<<<
@@ -6500,7 +6504,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base);
   goto __pyx_L0;
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1045
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":1045
  * 
  * 
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -16373,12 +16377,12 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
   PyObject *__pyx_t_3 = NULL;
   struct __pyx_opt_args_7cytimes_10cydatetime_dt_add __pyx_t_4;
   PyObject *__pyx_t_5 = NULL;
-  PyObject *__pyx_t_6 = NULL;
-  int __pyx_t_7;
-  int __pyx_t_8;
-  struct __pyx_opt_args_7cytimes_10cydatetime_dt_replace __pyx_t_9;
-  PyObject *__pyx_t_10 = NULL;
-  int __pyx_t_11;
+  int __pyx_t_6;
+  PyObject *__pyx_t_7 = NULL;
+  PyObject *__pyx_t_8 = NULL;
+  int __pyx_t_9;
+  int __pyx_t_10;
+  struct __pyx_opt_args_7cytimes_10cydatetime_dt_replace __pyx_t_11;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -16518,8 +16522,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # 'end' is specified
  *     elif end is not None:
  */
-      __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_gen_dt_local()); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 802, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_2);
+      __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_cydt); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 802, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_3);
+      __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_gen_dt_local); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 802, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __pyx_t_3 = NULL;
+      __pyx_t_6 = 0;
+      #if CYTHON_UNPACK_METHODS
+      if (unlikely(PyMethod_Check(__pyx_t_5))) {
+        __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5);
+        if (likely(__pyx_t_3)) {
+          PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);
+          __Pyx_INCREF(__pyx_t_3);
+          __Pyx_INCREF(function);
+          __Pyx_DECREF_SET(__pyx_t_5, function);
+          __pyx_t_6 = 1;
+        }
+      }
+      #endif
+      {
+        PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
+        __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_6, 0+__pyx_t_6);
+        __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+        if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 802, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_2);
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+      }
+      if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_7cpython_8datetime_datetime))))) __PYX_ERR(0, 802, __pyx_L1_error)
       __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_2);
       __pyx_t_2 = 0;
     }
@@ -16564,11 +16594,11 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  */
       __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), __pyx_v_end); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 806, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_2)->_dt);
-      __Pyx_INCREF(__pyx_t_3);
+      __pyx_t_5 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_2)->_dt);
+      __Pyx_INCREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_3);
-      __pyx_t_3 = 0;
+      __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_5);
+      __pyx_t_5 = 0;
 
       /* "mysqlengine/utils.py":807
  *         if days > 0:  # 'days' provided
@@ -16581,10 +16611,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
       __pyx_t_4.days = (1 - __pyx_v_days);
       __pyx_t_4.seconds = 0;
       __pyx_t_4.microseconds = 0;
-      __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_e_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 807, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_3);
-      __pyx_t_3 = 0;
+      __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_e_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 807, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_5);
+      __pyx_t_5 = 0;
 
       /* "mysqlengine/utils.py":805
  *     # 'end' is specified
@@ -16604,11 +16634,11 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # 'days' is specified
  */
     /*else*/ {
-      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), __pyx_v_end); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 809, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_2 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_3)->_dt);
+      __pyx_t_5 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), __pyx_v_end); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 809, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __pyx_t_2 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_5)->_dt);
       __Pyx_INCREF(__pyx_t_2);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_2);
       __pyx_t_2 = 0;
 
@@ -16619,8 +16649,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # 'days' is specified
  *     elif days >= 0:
  */
-      __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_gen_dt_local()); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 810, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_2);
+      __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_cydt); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 810, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_gen_dt_local); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 810, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_3);
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __pyx_t_5 = NULL;
+      __pyx_t_6 = 0;
+      #if CYTHON_UNPACK_METHODS
+      if (unlikely(PyMethod_Check(__pyx_t_3))) {
+        __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3);
+        if (likely(__pyx_t_5)) {
+          PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
+          __Pyx_INCREF(__pyx_t_5);
+          __Pyx_INCREF(function);
+          __Pyx_DECREF_SET(__pyx_t_3, function);
+          __pyx_t_6 = 1;
+        }
+      }
+      #endif
+      {
+        PyObject *__pyx_callargs[2] = {__pyx_t_5, NULL};
+        __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 0+__pyx_t_6);
+        __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
+        if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 810, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_2);
+        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      }
+      if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_7cpython_8datetime_datetime))))) __PYX_ERR(0, 810, __pyx_L1_error)
       __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_2);
       __pyx_t_2 = 0;
     }
@@ -16653,8 +16709,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_add(e_dt, 1 - days, 0, 0)
  *     # Invalid
  */
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_gen_dt_local()); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 813, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_cydt); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 813, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_gen_dt_local); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 813, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_5);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_3 = NULL;
+    __pyx_t_6 = 0;
+    #if CYTHON_UNPACK_METHODS
+    if (unlikely(PyMethod_Check(__pyx_t_5))) {
+      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5);
+      if (likely(__pyx_t_3)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);
+        __Pyx_INCREF(__pyx_t_3);
+        __Pyx_INCREF(function);
+        __Pyx_DECREF_SET(__pyx_t_5, function);
+        __pyx_t_6 = 1;
+      }
+    }
+    #endif
+    {
+      PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
+      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_6, 0+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 813, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_2);
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    }
+    if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_7cpython_8datetime_datetime))))) __PYX_ERR(0, 813, __pyx_L1_error)
     __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_2);
     __pyx_t_2 = 0;
 
@@ -16751,12 +16833,12 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  * 
  *     # Unit not specified
  */
-    __pyx_t_5 = ((PyObject *)__pyx_v_e_dt);
-    __pyx_t_6 = ((PyObject *)__pyx_v_s_dt);
-    __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_5);
-    __pyx_t_5 = 0;
-    __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_6);
-    __pyx_t_6 = 0;
+    __pyx_t_7 = ((PyObject *)__pyx_v_e_dt);
+    __pyx_t_8 = ((PyObject *)__pyx_v_s_dt);
+    __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_7);
+    __pyx_t_7 = 0;
+    __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_8);
+    __pyx_t_8 = 0;
 
     /* "mysqlengine/utils.py":823
  * 
@@ -16774,15 +16856,15 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         return (s_dt, e_dt)
  * 
  */
-  __pyx_t_7 = (__pyx_v_unit == ((PyObject*)Py_None));
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__pyx_v_unit == ((PyObject*)Py_None));
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L9_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_IS_TRUE(__pyx_v_unit) != 0);
-  __pyx_t_8 = (!__pyx_t_7);
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_9 = (__Pyx_PyUnicode_IS_TRUE(__pyx_v_unit) != 0);
+  __pyx_t_10 = (!__pyx_t_9);
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L9_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -16822,14 +16904,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_replace(s_dt, -1, 1, 1, 0, 0, 0, 0, -1, -1)
  *         e_dt = cydt.dt_replace(e_dt, -1, 12, 31, 23, 59, 59, 999999, -1, -1)
  */
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_year, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 831, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_year, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 831, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L12_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_Y, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 831, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_Y, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 831, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L12_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -16840,17 +16922,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         e_dt = cydt.dt_replace(e_dt, -1, 12, 31, 23, 59, 59, 999999, -1, -1)
  *     # Adjust to 'month'
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = 1;
-    __pyx_t_9.day = 1;
-    __pyx_t_9.hour = 0;
-    __pyx_t_9.minute = 0;
-    __pyx_t_9.second = 0;
-    __pyx_t_9.microsecond = 0;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 832, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = 1;
+    __pyx_t_11.day = 1;
+    __pyx_t_11.hour = 0;
+    __pyx_t_11.minute = 0;
+    __pyx_t_11.second = 0;
+    __pyx_t_11.microsecond = 0;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 832, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_s_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -16862,17 +16944,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # Adjust to 'month'
  *     elif unit == "month" or unit == "M":
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = 12;
-    __pyx_t_9.day = 31;
-    __pyx_t_9.hour = 23;
-    __pyx_t_9.minute = 59;
-    __pyx_t_9.second = 59;
-    __pyx_t_9.microsecond = 0xF423F;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 833, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = 12;
+    __pyx_t_11.day = 31;
+    __pyx_t_11.hour = 23;
+    __pyx_t_11.minute = 59;
+    __pyx_t_11.second = 59;
+    __pyx_t_11.microsecond = 0xF423F;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 833, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_e_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -16894,14 +16976,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_replace(s_dt, -1, -1, 1, 0, 0, 0, 0, -1, -1)
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, 31, 23, 59, 59, 999999, -1, -1)
  */
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_month, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 835, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_month, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 835, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L14_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_M, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 835, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_M, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 835, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L14_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -16912,17 +16994,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, 31, 23, 59, 59, 999999, -1, -1)
  *     # Adjust to 'day'
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = 1;
-    __pyx_t_9.hour = 0;
-    __pyx_t_9.minute = 0;
-    __pyx_t_9.second = 0;
-    __pyx_t_9.microsecond = 0;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 836, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = 1;
+    __pyx_t_11.hour = 0;
+    __pyx_t_11.minute = 0;
+    __pyx_t_11.second = 0;
+    __pyx_t_11.microsecond = 0;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 836, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_s_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -16934,17 +17016,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # Adjust to 'day'
  *     elif unit == "day" or unit == "D" or unit == "week" or unit == "W":
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = 31;
-    __pyx_t_9.hour = 23;
-    __pyx_t_9.minute = 59;
-    __pyx_t_9.second = 59;
-    __pyx_t_9.microsecond = 0xF423F;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 837, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = 31;
+    __pyx_t_11.hour = 23;
+    __pyx_t_11.minute = 59;
+    __pyx_t_11.second = 59;
+    __pyx_t_11.microsecond = 0xF423F;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 837, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_e_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -16966,26 +17048,26 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_replace(s_dt, -1, -1, -1, 0, 0, 0, 0, -1, -1)
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, 23, 59, 59, 999999, -1, -1)
  */
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_day, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_day, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L16_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_D, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_D, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L16_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_week, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_week, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L16_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_W, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_W, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 839, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L16_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -16996,17 +17078,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, 23, 59, 59, 999999, -1, -1)
  *     # Adjust to 'hour'
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = 0;
-    __pyx_t_9.minute = 0;
-    __pyx_t_9.second = 0;
-    __pyx_t_9.microsecond = 0;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 840, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = 0;
+    __pyx_t_11.minute = 0;
+    __pyx_t_11.second = 0;
+    __pyx_t_11.microsecond = 0;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 840, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_s_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17018,17 +17100,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # Adjust to 'hour'
  *     elif unit == "hour" or unit == "h":
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = 23;
-    __pyx_t_9.minute = 59;
-    __pyx_t_9.second = 59;
-    __pyx_t_9.microsecond = 0xF423F;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 841, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = 23;
+    __pyx_t_11.minute = 59;
+    __pyx_t_11.second = 59;
+    __pyx_t_11.microsecond = 0xF423F;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 841, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_e_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17050,14 +17132,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_replace(s_dt, -1, -1, -1, -1, 0, 0, 0, -1, -1)
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, -1, 59, 59, 999999, -1, -1)
  */
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_hour, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 843, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_hour, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 843, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L20_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_h, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 843, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_h, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 843, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L20_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -17068,17 +17150,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, -1, 59, 59, 999999, -1, -1)
  *     # Adjust to 'minute'
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = -1;
-    __pyx_t_9.minute = 0;
-    __pyx_t_9.second = 0;
-    __pyx_t_9.microsecond = 0;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 844, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = -1;
+    __pyx_t_11.minute = 0;
+    __pyx_t_11.second = 0;
+    __pyx_t_11.microsecond = 0;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 844, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_s_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17090,17 +17172,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # Adjust to 'minute'
  *     elif unit == "minute" or unit == "m":
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = -1;
-    __pyx_t_9.minute = 59;
-    __pyx_t_9.second = 59;
-    __pyx_t_9.microsecond = 0xF423F;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 845, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = -1;
+    __pyx_t_11.minute = 59;
+    __pyx_t_11.second = 59;
+    __pyx_t_11.microsecond = 0xF423F;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 845, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_e_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17122,14 +17204,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_replace(s_dt, -1, -1, -1, -1, -1, 0, 0, -1, -1)
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, -1, -1, 59, 999999, -1, -1)
  */
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_minute, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 847, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_minute, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 847, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L22_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_m_2, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 847, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_m_2, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 847, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L22_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -17140,17 +17222,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, -1, -1, 59, 999999, -1, -1)
  *     # Adjust to 'second'
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = -1;
-    __pyx_t_9.minute = -1;
-    __pyx_t_9.second = 0;
-    __pyx_t_9.microsecond = 0;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 848, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = -1;
+    __pyx_t_11.minute = -1;
+    __pyx_t_11.second = 0;
+    __pyx_t_11.microsecond = 0;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 848, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_s_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17162,17 +17244,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # Adjust to 'second'
  *     elif unit == "second" or unit == "s":
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = -1;
-    __pyx_t_9.minute = -1;
-    __pyx_t_9.second = 59;
-    __pyx_t_9.microsecond = 0xF423F;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 849, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = -1;
+    __pyx_t_11.minute = -1;
+    __pyx_t_11.second = 59;
+    __pyx_t_11.microsecond = 0xF423F;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 849, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_e_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17194,14 +17276,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_replace(s_dt, -1, -1, -1, -1, -1, -1, 0, -1, -1)
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, -1, -1, -1, 999999, -1, -1)
  */
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_second, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 851, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_second, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 851, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L24_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_s, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 851, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_s, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 851, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L24_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -17212,17 +17294,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         e_dt = cydt.dt_replace(e_dt, -1, -1, -1, -1, -1, -1, 999999, -1, -1)
  *     # Adjust to 'microsecond'
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = -1;
-    __pyx_t_9.minute = -1;
-    __pyx_t_9.second = -1;
-    __pyx_t_9.microsecond = 0;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 852, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = -1;
+    __pyx_t_11.minute = -1;
+    __pyx_t_11.second = -1;
+    __pyx_t_11.microsecond = 0;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_s_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 852, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_s_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17234,17 +17316,17 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # Adjust to 'microsecond'
  *     elif unit == "microsecond" or unit == "us":
  */
-    __pyx_t_9.__pyx_n = 9;
-    __pyx_t_9.year = -1;
-    __pyx_t_9.month = -1;
-    __pyx_t_9.day = -1;
-    __pyx_t_9.hour = -1;
-    __pyx_t_9.minute = -1;
-    __pyx_t_9.second = -1;
-    __pyx_t_9.microsecond = 0xF423F;
-    __pyx_t_9.tzinfo = __pyx_int_neg_1;
-    __pyx_t_9.fold = -1;
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_9)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 853, __pyx_L1_error)
+    __pyx_t_11.__pyx_n = 9;
+    __pyx_t_11.year = -1;
+    __pyx_t_11.month = -1;
+    __pyx_t_11.day = -1;
+    __pyx_t_11.hour = -1;
+    __pyx_t_11.minute = -1;
+    __pyx_t_11.second = -1;
+    __pyx_t_11.microsecond = 0xF423F;
+    __pyx_t_11.tzinfo = __pyx_int_neg_1;
+    __pyx_t_11.fold = -1;
+    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_replace(__pyx_v_e_dt, &__pyx_t_11)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 853, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF_SET(__pyx_v_e_dt, ((PyDateTime_DateTime *)__pyx_t_2));
     __pyx_t_2 = 0;
@@ -17266,14 +17348,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *         pass
  *     # Invalid
  */
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_microsecond, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 855, __pyx_L1_error)
-  if (!__pyx_t_8) {
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_microsecond, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 855, __pyx_L1_error)
+  if (!__pyx_t_10) {
   } else {
-    __pyx_t_1 = __pyx_t_8;
+    __pyx_t_1 = __pyx_t_10;
     goto __pyx_L26_bool_binop_done;
   }
-  __pyx_t_8 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_us, Py_EQ)); if (unlikely((__pyx_t_8 < 0))) __PYX_ERR(0, 855, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_8;
+  __pyx_t_10 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_us, Py_EQ)); if (unlikely((__pyx_t_10 < 0))) __PYX_ERR(0, 855, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_10;
   __pyx_L26_bool_binop_done:;
   if (likely(__pyx_t_1)) {
     goto __pyx_L11;
@@ -17287,35 +17369,35 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  *     # Return
  */
   /*else*/ {
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_cal_time_span_Invalid_unit, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 859, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_10 = NULL;
-    __pyx_t_11 = 0;
+    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_cal_time_span_Invalid_unit, __pyx_n_s_format); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 859, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_t_3 = NULL;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_3))) {
-      __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_3);
-      if (likely(__pyx_t_10)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
-        __Pyx_INCREF(__pyx_t_10);
+    if (likely(PyMethod_Check(__pyx_t_5))) {
+      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5);
+      if (likely(__pyx_t_3)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);
+        __Pyx_INCREF(__pyx_t_3);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_3, function);
-        __pyx_t_11 = 1;
+        __Pyx_DECREF_SET(__pyx_t_5, function);
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[2] = {__pyx_t_10, __pyx_v_unit};
-      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_11, 1+__pyx_t_11);
-      __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
+      PyObject *__pyx_callargs[2] = {__pyx_t_3, __pyx_v_unit};
+      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
       if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 859, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     }
-    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 859, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 859, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __Pyx_Raise(__pyx_t_3, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __Pyx_Raise(__pyx_t_5, 0, 0, 0);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __PYX_ERR(0, 859, __pyx_L1_error)
   }
   __pyx_L11:;
@@ -17328,16 +17410,16 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
  * 
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 862, __pyx_L1_error)
-  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 862, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_5);
   __Pyx_INCREF((PyObject *)__pyx_v_s_dt);
   __Pyx_GIVEREF((PyObject *)__pyx_v_s_dt);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_s_dt))) __PYX_ERR(0, 862, __pyx_L1_error);
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_v_s_dt))) __PYX_ERR(0, 862, __pyx_L1_error);
   __Pyx_INCREF((PyObject *)__pyx_v_e_dt);
   __Pyx_GIVEREF((PyObject *)__pyx_v_e_dt);
-  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_3, 1, ((PyObject *)__pyx_v_e_dt))) __PYX_ERR(0, 862, __pyx_L1_error);
-  __pyx_r = ((PyObject*)__pyx_t_3);
-  __pyx_t_3 = 0;
+  if (__Pyx_PyTuple_SET_ITEM(__pyx_t_5, 1, ((PyObject *)__pyx_v_e_dt))) __PYX_ERR(0, 862, __pyx_L1_error);
+  __pyx_r = ((PyObject*)__pyx_t_5);
+  __pyx_t_5 = 0;
   goto __pyx_L0;
 
   /* "mysqlengine/utils.py":754
@@ -17352,7 +17434,7 @@ static PyObject *__pyx_f_11mysqlengine_5utils__cal_time_span(PyObject *__pyx_v_s
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_XDECREF(__pyx_t_10);
+  __Pyx_XDECREF(__pyx_t_5);
   __Pyx_AddTraceback("mysqlengine.utils._cal_time_span", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = 0;
   __pyx_L0:;
@@ -17658,8 +17740,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
   PyObject *__pyx_t_3 = NULL;
   struct __pyx_opt_args_7cytimes_10cydatetime_dt_add __pyx_t_4;
   PyObject *__pyx_t_5 = NULL;
-  PyObject *__pyx_t_6 = NULL;
-  int __pyx_t_7;
+  int __pyx_t_6;
+  PyObject *__pyx_t_7 = NULL;
   PyObject *__pyx_t_8 = NULL;
   int __pyx_t_9;
   int __pyx_t_10;
@@ -17805,8 +17887,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *     # 'end' is specified
  *     elif end is not None:
  */
-      __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_gen_dt_local()); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 945, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_2);
+      __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_cydt); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 945, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_3);
+      __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_gen_dt_local); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 945, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __pyx_t_3 = NULL;
+      __pyx_t_6 = 0;
+      #if CYTHON_UNPACK_METHODS
+      if (unlikely(PyMethod_Check(__pyx_t_5))) {
+        __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5);
+        if (likely(__pyx_t_3)) {
+          PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);
+          __Pyx_INCREF(__pyx_t_3);
+          __Pyx_INCREF(function);
+          __Pyx_DECREF_SET(__pyx_t_5, function);
+          __pyx_t_6 = 1;
+        }
+      }
+      #endif
+      {
+        PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
+        __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_6, 0+__pyx_t_6);
+        __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+        if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 945, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_2);
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+      }
+      if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_7cpython_8datetime_datetime))))) __PYX_ERR(0, 945, __pyx_L1_error)
       __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_2);
       __pyx_t_2 = 0;
     }
@@ -17851,11 +17959,11 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  */
       __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), __pyx_v_end); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 949, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_3 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_2)->_dt);
-      __Pyx_INCREF(__pyx_t_3);
+      __pyx_t_5 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_2)->_dt);
+      __Pyx_INCREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-      __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_3);
-      __pyx_t_3 = 0;
+      __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_5);
+      __pyx_t_5 = 0;
 
       /* "mysqlengine/utils.py":950
  *         if days > 0:  # 'days' provided
@@ -17868,10 +17976,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
       __pyx_t_4.days = (1 - __pyx_v_days);
       __pyx_t_4.seconds = 0;
       __pyx_t_4.microseconds = 0;
-      __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_e_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 950, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_3);
-      __pyx_t_3 = 0;
+      __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_e_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 950, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_5);
+      __pyx_t_5 = 0;
 
       /* "mysqlengine/utils.py":948
  *     # 'end' is specified
@@ -17891,11 +17999,11 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *     # 'days' is specified
  */
     /*else*/ {
-      __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), __pyx_v_end); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 952, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_2 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_3)->_dt);
+      __pyx_t_5 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), __pyx_v_end); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 952, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __pyx_t_2 = ((PyObject *)((struct __pyx_obj_7cytimes_4pydt_pydt *)__pyx_t_5)->_dt);
       __Pyx_INCREF(__pyx_t_2);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_2);
       __pyx_t_2 = 0;
 
@@ -17906,8 +18014,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *     # 'days' is specified
  *     elif days >= 0:
  */
-      __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_gen_dt_local()); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 953, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_2);
+      __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_cydt); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 953, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_gen_dt_local); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 953, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_3);
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __pyx_t_5 = NULL;
+      __pyx_t_6 = 0;
+      #if CYTHON_UNPACK_METHODS
+      if (unlikely(PyMethod_Check(__pyx_t_3))) {
+        __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3);
+        if (likely(__pyx_t_5)) {
+          PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
+          __Pyx_INCREF(__pyx_t_5);
+          __Pyx_INCREF(function);
+          __Pyx_DECREF_SET(__pyx_t_3, function);
+          __pyx_t_6 = 1;
+        }
+      }
+      #endif
+      {
+        PyObject *__pyx_callargs[2] = {__pyx_t_5, NULL};
+        __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 0+__pyx_t_6);
+        __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
+        if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 953, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_2);
+        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      }
+      if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_7cpython_8datetime_datetime))))) __PYX_ERR(0, 953, __pyx_L1_error)
       __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_2);
       __pyx_t_2 = 0;
     }
@@ -17940,8 +18074,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         s_dt = cydt.dt_add(e_dt, 1 - days, 0, 0)
  *     # Invalid
  */
-    __pyx_t_2 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_gen_dt_local()); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 956, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_cydt); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 956, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_gen_dt_local); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 956, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_5);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_3 = NULL;
+    __pyx_t_6 = 0;
+    #if CYTHON_UNPACK_METHODS
+    if (unlikely(PyMethod_Check(__pyx_t_5))) {
+      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5);
+      if (likely(__pyx_t_3)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);
+        __Pyx_INCREF(__pyx_t_3);
+        __Pyx_INCREF(function);
+        __Pyx_DECREF_SET(__pyx_t_5, function);
+        __pyx_t_6 = 1;
+      }
+    }
+    #endif
+    {
+      PyObject *__pyx_callargs[2] = {__pyx_t_3, NULL};
+      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_6, 0+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+      if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 956, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_2);
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    }
+    if (!(likely(((__pyx_t_2) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_7cpython_8datetime_datetime))))) __PYX_ERR(0, 956, __pyx_L1_error)
     __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_2);
     __pyx_t_2 = 0;
 
@@ -18037,12 +18197,12 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  * 
  *     # Pre binding
  */
-    __pyx_t_5 = ((PyObject *)__pyx_v_e_dt);
-    __pyx_t_6 = ((PyObject *)__pyx_v_s_dt);
-    __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_5);
-    __pyx_t_5 = 0;
-    __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_6);
-    __pyx_t_6 = 0;
+    __pyx_t_7 = ((PyObject *)__pyx_v_e_dt);
+    __pyx_t_8 = ((PyObject *)__pyx_v_s_dt);
+    __pyx_v_s_dt = ((PyDateTime_DateTime *)__pyx_t_7);
+    __pyx_t_7 = 0;
+    __pyx_v_e_dt = ((PyDateTime_DateTime *)__pyx_t_8);
+    __pyx_t_8 = 0;
 
     /* "mysqlengine/utils.py":966
  * 
@@ -18075,14 +18235,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "Y", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_year, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 974, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_year, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 974, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L9_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_Y, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 974, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_Y, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 974, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L9_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -18093,36 +18253,36 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         if delta > 0:
  *             year: cython.int = cydt.get_year(s_dt)
  */
-    __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 975, __pyx_L1_error)
+    __pyx_t_5 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 975, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_between); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 975, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_between); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 975, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = NULL;
-    __pyx_t_9 = 0;
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_t_5 = NULL;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_8))) {
-      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_8);
-      if (likely(__pyx_t_3)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8);
-        __Pyx_INCREF(__pyx_t_3);
+    if (likely(PyMethod_Check(__pyx_t_3))) {
+      __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_3);
+      if (likely(__pyx_t_5)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
+        __Pyx_INCREF(__pyx_t_5);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_8, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_3, function);
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[4] = {__pyx_t_3, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_Y, Py_False};
-      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_8, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+      PyObject *__pyx_callargs[4] = {__pyx_t_5, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_Y, Py_False};
+      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
       if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 975, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 975, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 975, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":976
  *     if unit == "year" or unit == "Y":
@@ -18141,8 +18301,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *             for i in range(1, delta):
  *                 res.append(cydt.dt_replace(s_dt, year + i))
  */
-      __pyx_t_9 = __pyx_f_7cytimes_10cydatetime_get_year(((PyObject *)__pyx_v_s_dt)); if (unlikely(__pyx_t_9 == ((int)-1))) __PYX_ERR(0, 977, __pyx_L1_error)
-      __pyx_v_year = __pyx_t_9;
+      __pyx_t_6 = __pyx_f_7cytimes_10cydatetime_get_year(((PyObject *)__pyx_v_s_dt)); if (unlikely(__pyx_t_6 == ((int)-1))) __PYX_ERR(0, 977, __pyx_L1_error)
+      __pyx_v_year = __pyx_t_6;
 
       /* "mysqlengine/utils.py":978
  *         if delta > 0:
@@ -18151,8 +18311,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(cydt.dt_replace(s_dt, year + i))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -18206,14 +18366,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "M", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_month, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 982, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_month, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 982, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L14_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_M, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 982, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_M, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 982, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L14_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -18224,36 +18384,36 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         if delta > 0:
  *             for i in range(1, delta):
  */
-    __pyx_t_8 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 983, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_between); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 983, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 983, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-    __pyx_t_8 = NULL;
-    __pyx_t_9 = 0;
+    __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_between); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 983, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_5);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_3 = NULL;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_3))) {
-      __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_3);
-      if (likely(__pyx_t_8)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
-        __Pyx_INCREF(__pyx_t_8);
+    if (likely(PyMethod_Check(__pyx_t_5))) {
+      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_5);
+      if (likely(__pyx_t_3)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5);
+        __Pyx_INCREF(__pyx_t_3);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_3, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_5, function);
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[4] = {__pyx_t_8, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_M, Py_False};
-      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
+      PyObject *__pyx_callargs[4] = {__pyx_t_3, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_M, Py_False};
+      __pyx_t_2 = __Pyx_PyObject_FastCall(__pyx_t_5, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
       if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 983, __pyx_L1_error)
       __Pyx_GOTREF(__pyx_t_2);
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 983, __pyx_L1_error)
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 983, __pyx_L1_error)
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":984
  *     elif unit == "month" or unit == "M":
@@ -18272,8 +18432,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(s_dt + cytimedelta(months=i))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -18286,21 +18446,21 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  */
         __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_cytimedelta); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 986, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_2);
-        __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 986, __pyx_L1_error)
+        __pyx_t_5 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 986, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
+        __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_i); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 986, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_8 = __Pyx_PyInt_From_int(__pyx_v_i); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 986, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_8);
-        if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_months, __pyx_t_8) < 0) __PYX_ERR(0, 986, __pyx_L1_error)
-        __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-        __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 986, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_8);
-        __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+        if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_months, __pyx_t_3) < 0) __PYX_ERR(0, 986, __pyx_L1_error)
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-        __pyx_t_3 = PyNumber_Add(((PyObject *)__pyx_v_s_dt), __pyx_t_8); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 986, __pyx_L1_error)
+        __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, __pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 986, __pyx_L1_error)
         __Pyx_GOTREF(__pyx_t_3);
-        __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_3); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 986, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+        __pyx_t_5 = PyNumber_Add(((PyObject *)__pyx_v_s_dt), __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 986, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_5); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 986, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
 
       /* "mysqlengine/utils.py":987
@@ -18338,14 +18498,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "W", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_week, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 989, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_week, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 989, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L19_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_W, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 989, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_W, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 989, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L19_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -18356,36 +18516,36 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         if delta > 0:
  *             for i in range(1, delta):
  */
-    __pyx_t_8 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 990, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_between); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 990, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 990, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_between); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 990, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-    __pyx_t_8 = NULL;
-    __pyx_t_9 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_3 = NULL;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
     if (likely(PyMethod_Check(__pyx_t_2))) {
-      __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_2);
-      if (likely(__pyx_t_8)) {
+      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2);
+      if (likely(__pyx_t_3)) {
         PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2);
-        __Pyx_INCREF(__pyx_t_8);
+        __Pyx_INCREF(__pyx_t_3);
         __Pyx_INCREF(function);
         __Pyx_DECREF_SET(__pyx_t_2, function);
-        __pyx_t_9 = 1;
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[4] = {__pyx_t_8, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_W, Py_False};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 990, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
+      PyObject *__pyx_callargs[4] = {__pyx_t_3, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_W, Py_False};
+      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+      if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 990, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 990, __pyx_L1_error)
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 990, __pyx_L1_error)
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":991
  *     elif unit == "week" or unit == "W":
@@ -18404,8 +18564,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(cydt.dt_add(s_dt, i * 7, 0, 0))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -18420,10 +18580,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
         __pyx_t_4.days = (__pyx_v_i * 7);
         __pyx_t_4.seconds = 0;
         __pyx_t_4.microseconds = 0;
-        __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 993, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_3); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 993, __pyx_L1_error)
-        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+        __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 993, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
+        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_5); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 993, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
 
       /* "mysqlengine/utils.py":994
@@ -18461,14 +18621,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "D", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_day, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 996, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_day, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 996, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L24_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_D, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 996, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_D, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 996, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L24_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -18481,34 +18641,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  */
     __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 997, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_between); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 997, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_between); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 997, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __pyx_t_2 = NULL;
-    __pyx_t_9 = 0;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_8))) {
-      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_8);
+    if (likely(PyMethod_Check(__pyx_t_3))) {
+      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3);
       if (likely(__pyx_t_2)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8);
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
         __Pyx_INCREF(__pyx_t_2);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_8, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_3, function);
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
       PyObject *__pyx_callargs[4] = {__pyx_t_2, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_D, Py_False};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_8, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
+      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 997, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+      if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 997, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 997, __pyx_L1_error)
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 997, __pyx_L1_error)
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":998
  *     elif unit == "day" or unit == "D":
@@ -18527,8 +18687,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(cydt.dt_add(s_dt, i, 0, 0))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -18543,10 +18703,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
         __pyx_t_4.days = __pyx_v_i;
         __pyx_t_4.seconds = 0;
         __pyx_t_4.microseconds = 0;
-        __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1000, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_3); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1000, __pyx_L1_error)
-        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+        __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1000, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
+        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_5); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1000, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
 
       /* "mysqlengine/utils.py":1001
@@ -18584,14 +18744,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "h", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_hour, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1003, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_hour, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1003, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L29_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_h, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1003, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_h, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1003, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L29_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -18602,36 +18762,36 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         if delta > 0:
  *             for i in range(1, delta):
  */
-    __pyx_t_8 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1004, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_between); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1004, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1004, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_between); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1004, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-    __pyx_t_8 = NULL;
-    __pyx_t_9 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_3 = NULL;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
     if (likely(PyMethod_Check(__pyx_t_2))) {
-      __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_2);
-      if (likely(__pyx_t_8)) {
+      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2);
+      if (likely(__pyx_t_3)) {
         PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2);
-        __Pyx_INCREF(__pyx_t_8);
+        __Pyx_INCREF(__pyx_t_3);
         __Pyx_INCREF(function);
         __Pyx_DECREF_SET(__pyx_t_2, function);
-        __pyx_t_9 = 1;
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[4] = {__pyx_t_8, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_h, Py_False};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1004, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
+      PyObject *__pyx_callargs[4] = {__pyx_t_3, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_h, Py_False};
+      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+      if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1004, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1004, __pyx_L1_error)
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1004, __pyx_L1_error)
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":1005
  *     elif unit == "hour" or unit == "h":
@@ -18650,8 +18810,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(cydt.dt_add(s_dt, 0, 3600 * i, 0))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -18666,10 +18826,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
         __pyx_t_4.days = 0;
         __pyx_t_4.seconds = (0xE10 * __pyx_v_i);
         __pyx_t_4.microseconds = 0;
-        __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1007, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_3); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1007, __pyx_L1_error)
-        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+        __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1007, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
+        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_5); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1007, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
 
       /* "mysqlengine/utils.py":1008
@@ -18707,14 +18867,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "m", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_minute, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1010, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_minute, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1010, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L34_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_m_2, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1010, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_m_2, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1010, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L34_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -18727,34 +18887,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  */
     __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1011, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_between); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1011, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_between); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1011, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __pyx_t_2 = NULL;
-    __pyx_t_9 = 0;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_8))) {
-      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_8);
+    if (likely(PyMethod_Check(__pyx_t_3))) {
+      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3);
       if (likely(__pyx_t_2)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8);
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
         __Pyx_INCREF(__pyx_t_2);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_8, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_3, function);
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
       PyObject *__pyx_callargs[4] = {__pyx_t_2, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_m_2, Py_False};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_8, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
+      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1011, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+      if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1011, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1011, __pyx_L1_error)
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1011, __pyx_L1_error)
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":1012
  *     elif unit == "minute" or unit == "m":
@@ -18773,8 +18933,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(cydt.dt_add(s_dt, 0, 60 * i, 0))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -18789,10 +18949,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
         __pyx_t_4.days = 0;
         __pyx_t_4.seconds = (60 * __pyx_v_i);
         __pyx_t_4.microseconds = 0;
-        __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1014, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_3); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1014, __pyx_L1_error)
-        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+        __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1014, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
+        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_5); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1014, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
 
       /* "mysqlengine/utils.py":1015
@@ -18830,14 +18990,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "s", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_second, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1017, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_second, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1017, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L39_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_s, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1017, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_s, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1017, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L39_bool_binop_done:;
   if (__pyx_t_1) {
 
@@ -18848,36 +19008,36 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         if delta > 0:
  *             for i in range(1, delta):
  */
-    __pyx_t_8 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1018, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
-    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_between); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1018, __pyx_L1_error)
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1018, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_between); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1018, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
-    __pyx_t_8 = NULL;
-    __pyx_t_9 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_3 = NULL;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
     if (likely(PyMethod_Check(__pyx_t_2))) {
-      __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_2);
-      if (likely(__pyx_t_8)) {
+      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_2);
+      if (likely(__pyx_t_3)) {
         PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_2);
-        __Pyx_INCREF(__pyx_t_8);
+        __Pyx_INCREF(__pyx_t_3);
         __Pyx_INCREF(function);
         __Pyx_DECREF_SET(__pyx_t_2, function);
-        __pyx_t_9 = 1;
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
-      PyObject *__pyx_callargs[4] = {__pyx_t_8, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_s, Py_False};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
-      __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1018, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
+      PyObject *__pyx_callargs[4] = {__pyx_t_3, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_s, Py_False};
+      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
+      __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
+      if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1018, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1018, __pyx_L1_error)
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1018, __pyx_L1_error)
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":1019
  *     elif unit == "second" or unit == "s":
@@ -18896,8 +19056,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(cydt.dt_add(s_dt, 0, i, 0))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -18912,10 +19072,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
         __pyx_t_4.days = 0;
         __pyx_t_4.seconds = __pyx_v_i;
         __pyx_t_4.microseconds = 0;
-        __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1021, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_3); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1021, __pyx_L1_error)
-        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+        __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1021, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
+        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_5); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1021, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
 
       /* "mysqlengine/utils.py":1022
@@ -18953,14 +19113,14 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *         delta = pydt(e_dt).between(s_dt, "us", False)
  *         if delta > 0:
  */
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_microsecond, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1024, __pyx_L1_error)
-  if (!__pyx_t_7) {
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_microsecond, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1024, __pyx_L1_error)
+  if (!__pyx_t_9) {
   } else {
-    __pyx_t_1 = __pyx_t_7;
+    __pyx_t_1 = __pyx_t_9;
     goto __pyx_L44_bool_binop_done;
   }
-  __pyx_t_7 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_us, Py_EQ)); if (unlikely((__pyx_t_7 < 0))) __PYX_ERR(0, 1024, __pyx_L1_error)
-  __pyx_t_1 = __pyx_t_7;
+  __pyx_t_9 = (__Pyx_PyUnicode_Equals(__pyx_v_unit, __pyx_n_u_us, Py_EQ)); if (unlikely((__pyx_t_9 < 0))) __PYX_ERR(0, 1024, __pyx_L1_error)
+  __pyx_t_1 = __pyx_t_9;
   __pyx_L44_bool_binop_done:;
   if (likely(__pyx_t_1)) {
 
@@ -18973,34 +19133,34 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  */
     __pyx_t_2 = __Pyx_PyObject_CallOneArg(((PyObject *)__pyx_ptype_7cytimes_4pydt_pydt), ((PyObject *)__pyx_v_e_dt)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1025, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_between); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1025, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_between); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1025, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __pyx_t_2 = NULL;
-    __pyx_t_9 = 0;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_8))) {
-      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_8);
+    if (likely(PyMethod_Check(__pyx_t_3))) {
+      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3);
       if (likely(__pyx_t_2)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8);
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
         __Pyx_INCREF(__pyx_t_2);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_8, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_3, function);
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
       PyObject *__pyx_callargs[4] = {__pyx_t_2, ((PyObject *)__pyx_v_s_dt), __pyx_n_u_us, Py_False};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_8, __pyx_callargs+1-__pyx_t_9, 3+__pyx_t_9);
+      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 3+__pyx_t_6);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1025, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+      if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1025, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
-    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1025, __pyx_L1_error)
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_v_delta = __pyx_t_9;
+    __pyx_t_6 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_6 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 1025, __pyx_L1_error)
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_v_delta = __pyx_t_6;
 
     /* "mysqlengine/utils.py":1026
  *     elif unit == "microsecond" or unit == "us":
@@ -19019,8 +19179,8 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *                 res.append(cydt.dt_add(s_dt, 0, 0, i))
  *             res.append(e_dt)
  */
-      __pyx_t_9 = __pyx_v_delta;
-      __pyx_t_10 = __pyx_t_9;
+      __pyx_t_6 = __pyx_v_delta;
+      __pyx_t_10 = __pyx_t_6;
       for (__pyx_t_11 = 1; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) {
         __pyx_v_i = __pyx_t_11;
 
@@ -19035,10 +19195,10 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
         __pyx_t_4.days = 0;
         __pyx_t_4.seconds = 0;
         __pyx_t_4.microseconds = __pyx_v_i;
-        __pyx_t_3 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1028, __pyx_L1_error)
-        __Pyx_GOTREF(__pyx_t_3);
-        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_3); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1028, __pyx_L1_error)
-        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+        __pyx_t_5 = ((PyObject *)__pyx_f_7cytimes_10cydatetime_dt_add(__pyx_v_s_dt, &__pyx_t_4)); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1028, __pyx_L1_error)
+        __Pyx_GOTREF(__pyx_t_5);
+        __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_res, __pyx_t_5); if (unlikely(__pyx_t_13 == ((int)-1))) __PYX_ERR(0, 1028, __pyx_L1_error)
+        __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       }
 
       /* "mysqlengine/utils.py":1029
@@ -19077,35 +19237,35 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
  *     # Return
  */
   /*else*/ {
-    __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_gen_time_span_Invalid_unit, __pyx_n_s_format); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1032, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_kp_u_gen_time_span_Invalid_unit, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1032, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_2 = NULL;
-    __pyx_t_9 = 0;
+    __pyx_t_6 = 0;
     #if CYTHON_UNPACK_METHODS
-    if (likely(PyMethod_Check(__pyx_t_8))) {
-      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_8);
+    if (likely(PyMethod_Check(__pyx_t_3))) {
+      __pyx_t_2 = PyMethod_GET_SELF(__pyx_t_3);
       if (likely(__pyx_t_2)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8);
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3);
         __Pyx_INCREF(__pyx_t_2);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_8, function);
-        __pyx_t_9 = 1;
+        __Pyx_DECREF_SET(__pyx_t_3, function);
+        __pyx_t_6 = 1;
       }
     }
     #endif
     {
       PyObject *__pyx_callargs[2] = {__pyx_t_2, __pyx_v_unit};
-      __pyx_t_3 = __Pyx_PyObject_FastCall(__pyx_t_8, __pyx_callargs+1-__pyx_t_9, 1+__pyx_t_9);
+      __pyx_t_5 = __Pyx_PyObject_FastCall(__pyx_t_3, __pyx_callargs+1-__pyx_t_6, 1+__pyx_t_6);
       __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-      if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1032, __pyx_L1_error)
-      __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
+      if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 1032, __pyx_L1_error)
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
-    __pyx_t_8 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 1032, __pyx_L1_error)
-    __Pyx_GOTREF(__pyx_t_8);
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_builtin_ValueError, __pyx_t_5); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 1032, __pyx_L1_error)
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_Raise(__pyx_t_3, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __Pyx_Raise(__pyx_t_8, 0, 0, 0);
-    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
     __PYX_ERR(0, 1032, __pyx_L1_error)
   }
   __pyx_L8:;
@@ -19134,7 +19294,7 @@ static PyObject *__pyx_f_11mysqlengine_5utils__gen_time_span(PyObject *__pyx_v_s
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_XDECREF(__pyx_t_8);
+  __Pyx_XDECREF(__pyx_t_5);
   __Pyx_AddTraceback("mysqlengine.utils._gen_time_span", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = 0;
   __pyx_L0:;
@@ -20617,6 +20777,7 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_findall, __pyx_k_findall, sizeof(__pyx_k_findall), 0, 0, 1, 1},
     {&__pyx_n_s_float, __pyx_k_float, sizeof(__pyx_k_float), 0, 0, 1, 1},
     {&__pyx_n_s_format, __pyx_k_format, sizeof(__pyx_k_format), 0, 0, 1, 1},
+    {&__pyx_n_s_gen_dt_local, __pyx_k_gen_dt_local, sizeof(__pyx_k_gen_dt_local), 0, 0, 1, 1},
     {&__pyx_n_s_gen_time_span, __pyx_k_gen_time_span, sizeof(__pyx_k_gen_time_span), 0, 0, 1, 1},
     {&__pyx_kp_u_gen_time_span_Invalid_unit, __pyx_k_gen_time_span_Invalid_unit, sizeof(__pyx_k_gen_time_span_Invalid_unit), 0, 1, 0, 0},
     {&__pyx_kp_u_gen_time_span_Must_provide_as_l, __pyx_k_gen_time_span_Must_provide_as_l, sizeof(__pyx_k_gen_time_span_Must_provide_as_l), 0, 1, 0, 0},
@@ -20726,7 +20887,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":983
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":983
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy.core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -20737,7 +20898,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple_);
   __Pyx_GIVEREF(__pyx_tuple_);
 
-  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-s71fkjmu/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":989
+  /* "C:/Users/runneradmin/AppData/Local/Temp/pip-build-env-o1tb4bhz/overlay/Lib/site-packages/numpy/__init__.cython-30.pxd":989
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -21291,7 +21452,6 @@ static int __Pyx_modinit_function_import_code(void) {
   __pyx_t_1 = PyImport_ImportModule("cytimes.cydatetime"); if (!__pyx_t_1) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
   if (__Pyx_ImportFunction_3_0_4(__pyx_t_1, "get_year", (void (**)(void))&__pyx_f_7cytimes_10cydatetime_get_year, "int (PyObject *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
-  if (__Pyx_ImportFunction_3_0_4(__pyx_t_1, "gen_dt_local", (void (**)(void))&__pyx_f_7cytimes_10cydatetime_gen_dt_local, "PyDateTime_DateTime *(void)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   if (__Pyx_ImportFunction_3_0_4(__pyx_t_1, "dt_add", (void (**)(void))&__pyx_f_7cytimes_10cydatetime_dt_add, "PyDateTime_DateTime *(PyDateTime_DateTime *, struct __pyx_opt_args_7cytimes_10cydatetime_dt_add *__pyx_optional_args)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   if (__Pyx_ImportFunction_3_0_4(__pyx_t_1, "dt_replace", (void (**)(void))&__pyx_f_7cytimes_10cydatetime_dt_replace, "PyDateTime_DateTime *(PyDateTime_DateTime *, struct __pyx_opt_args_7cytimes_10cydatetime_dt_replace *__pyx_optional_args)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;