PyPI - mysqlengine - Versions diffs - 0.1.11.6__cp311-cp311-macosx_10_9_universal2.whl → 0.1.11.7__cp311-cp311-macosx_10_9_universal2.whl - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of mysqlengine might be problematic. Click here for more details.

Files changed (30) hide show

mysqlengine/charset.cpython-311-darwin.so +0 -0
mysqlengine/column.cpython-311-darwin.so +0 -0
mysqlengine/connection.c +9074 -8874
mysqlengine/connection.cpython-311-darwin.so +0 -0
mysqlengine/connection.py +16 -8
mysqlengine/constant.cpython-311-darwin.so +0 -0
mysqlengine/database.c +13436 -12308
mysqlengine/database.cpython-311-darwin.so +0 -0
mysqlengine/database.py +35 -1
mysqlengine/dtype.c +140 -140
mysqlengine/dtype.cpython-311-darwin.so +0 -0
mysqlengine/engine.c +503 -287
mysqlengine/engine.cpython-311-darwin.so +0 -0
mysqlengine/engine.py +7 -0
mysqlengine/errors.cpython-311-darwin.so +0 -0
mysqlengine/index.cpython-311-darwin.so +0 -0
mysqlengine/protocol.cpython-311-darwin.so +0 -0
mysqlengine/query.c +140 -140
mysqlengine/query.cpython-311-darwin.so +0 -0
mysqlengine/regex.cpython-311-darwin.so +0 -0
mysqlengine/settings.cpython-311-darwin.so +0 -0
mysqlengine/transcode.c +140 -140
mysqlengine/transcode.cpython-311-darwin.so +0 -0
mysqlengine/utils.c +810 -650
mysqlengine/utils.cpython-311-darwin.so +0 -0
{mysqlengine-0.1.11.6.dist-info → mysqlengine-0.1.11.7.dist-info}/METADATA +2 -2
{mysqlengine-0.1.11.6.dist-info → mysqlengine-0.1.11.7.dist-info}/RECORD +30 -30
{mysqlengine-0.1.11.6.dist-info → mysqlengine-0.1.11.7.dist-info}/LICENSE +0 -0
{mysqlengine-0.1.11.6.dist-info → mysqlengine-0.1.11.7.dist-info}/WHEEL +0 -0
{mysqlengine-0.1.11.6.dist-info → mysqlengine-0.1.11.7.dist-info}/top_level.txt +0 -0

mysqlengine/utils.c CHANGED Viewed

@@ -13,7 +13,7 @@
             "-Wno-unreachable-code"
         ],
         "include_dirs": [
-            "/private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/core/include"
+            "/private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/core/include"
         ],
         "name": "mysqlengine.utils",
         "sources": [
@@ -1584,7 +1584,7 @@ static const char *__pyx_f[] = {
 /* #### Code section: numeric_typedefs ### */
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":730
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":730
  * # in Cython to enable them only on the right systems.
  *
  * ctypedef npy_int8       int8_t             # <<<<<<<<<<<<<<
@@ -1593,7 +1593,7 @@ static const char *__pyx_f[] = {
  */
 typedef npy_int8 __pyx_t_5numpy_int8_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":731
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":731
  *
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t             # <<<<<<<<<<<<<<
@@ -1602,7 +1602,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t;
  */
 typedef npy_int16 __pyx_t_5numpy_int16_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":732
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":732
  * ctypedef npy_int8       int8_t
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t             # <<<<<<<<<<<<<<
@@ -1611,7 +1611,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t;
  */
 typedef npy_int32 __pyx_t_5numpy_int32_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":733
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":733
  * ctypedef npy_int16      int16_t
  * ctypedef npy_int32      int32_t
  * ctypedef npy_int64      int64_t             # <<<<<<<<<<<<<<
@@ -1620,7 +1620,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t;
  */
 typedef npy_int64 __pyx_t_5numpy_int64_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":737
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":737
  * #ctypedef npy_int128     int128_t
  *
  * ctypedef npy_uint8      uint8_t             # <<<<<<<<<<<<<<
@@ -1629,7 +1629,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t;
  */
 typedef npy_uint8 __pyx_t_5numpy_uint8_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":738
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":738
  *
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t             # <<<<<<<<<<<<<<
@@ -1638,7 +1638,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t;
  */
 typedef npy_uint16 __pyx_t_5numpy_uint16_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":739
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":739
  * ctypedef npy_uint8      uint8_t
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t             # <<<<<<<<<<<<<<
@@ -1647,7 +1647,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t;
  */
 typedef npy_uint32 __pyx_t_5numpy_uint32_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":740
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":740
  * ctypedef npy_uint16     uint16_t
  * ctypedef npy_uint32     uint32_t
  * ctypedef npy_uint64     uint64_t             # <<<<<<<<<<<<<<
@@ -1656,7 +1656,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t;
  */
 typedef npy_uint64 __pyx_t_5numpy_uint64_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":744
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":744
  * #ctypedef npy_uint128    uint128_t
  *
  * ctypedef npy_float32    float32_t             # <<<<<<<<<<<<<<
@@ -1665,7 +1665,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t;
  */
 typedef npy_float32 __pyx_t_5numpy_float32_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":745
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":745
  *
  * ctypedef npy_float32    float32_t
  * ctypedef npy_float64    float64_t             # <<<<<<<<<<<<<<
@@ -1674,7 +1674,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t;
  */
 typedef npy_float64 __pyx_t_5numpy_float64_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":754
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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             # <<<<<<<<<<<<<<
@@ -1683,7 +1683,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t;
  */
 typedef npy_long __pyx_t_5numpy_int_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":755
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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             # <<<<<<<<<<<<<<
@@ -1692,7 +1692,7 @@ typedef npy_long __pyx_t_5numpy_int_t;
  */
 typedef npy_longlong __pyx_t_5numpy_longlong_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":757
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":757
  * ctypedef npy_longlong   longlong_t
  *
  * ctypedef npy_ulong      uint_t             # <<<<<<<<<<<<<<
@@ -1701,7 +1701,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t;
  */
 typedef npy_ulong __pyx_t_5numpy_uint_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":758
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":758
  *
  * ctypedef npy_ulong      uint_t
  * ctypedef npy_ulonglong  ulonglong_t             # <<<<<<<<<<<<<<
@@ -1710,7 +1710,7 @@ typedef npy_ulong __pyx_t_5numpy_uint_t;
  */
 typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":760
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":760
  * ctypedef npy_ulonglong  ulonglong_t
  *
  * ctypedef npy_intp       intp_t             # <<<<<<<<<<<<<<
@@ -1719,7 +1719,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t;
  */
 typedef npy_intp __pyx_t_5numpy_intp_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":761
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":761
  *
  * ctypedef npy_intp       intp_t
  * ctypedef npy_uintp      uintp_t             # <<<<<<<<<<<<<<
@@ -1728,7 +1728,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t;
  */
 typedef npy_uintp __pyx_t_5numpy_uintp_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":763
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":763
  * ctypedef npy_uintp      uintp_t
  *
  * ctypedef npy_double     float_t             # <<<<<<<<<<<<<<
@@ -1737,7 +1737,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t;
  */
 typedef npy_double __pyx_t_5numpy_float_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":764
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":764
  *
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t             # <<<<<<<<<<<<<<
@@ -1746,7 +1746,7 @@ typedef npy_double __pyx_t_5numpy_float_t;
  */
 typedef npy_double __pyx_t_5numpy_double_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":765
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":765
  * ctypedef npy_double     float_t
  * ctypedef npy_double     double_t
  * ctypedef npy_longdouble longdouble_t             # <<<<<<<<<<<<<<
@@ -1812,7 +1812,7 @@ struct __pyx_opt_args_7cpython_11contextvars_get_value_no_default {
   PyObject *default_value;
 };
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":767
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":767
  * ctypedef npy_longdouble longdouble_t
  *
  * ctypedef npy_cfloat      cfloat_t             # <<<<<<<<<<<<<<
@@ -1821,7 +1821,7 @@ struct __pyx_opt_args_7cpython_11contextvars_get_value_no_default {
  */
 typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":768
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":768
  *
  * ctypedef npy_cfloat      cfloat_t
  * ctypedef npy_cdouble     cdouble_t             # <<<<<<<<<<<<<<
@@ -1830,7 +1830,7 @@ typedef npy_cfloat __pyx_t_5numpy_cfloat_t;
  */
 typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":769
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":769
  * ctypedef npy_cfloat      cfloat_t
  * ctypedef npy_cdouble     cdouble_t
  * ctypedef npy_clongdouble clongdouble_t             # <<<<<<<<<<<<<<
@@ -1839,7 +1839,7 @@ typedef npy_cdouble __pyx_t_5numpy_cdouble_t;
  */
 typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t;
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":771
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":771
  * ctypedef npy_clongdouble clongdouble_t
  *
  * ctypedef npy_cdouble     complex_t             # <<<<<<<<<<<<<<
@@ -1968,7 +1968,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 {
@@ -2010,8 +2010,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;
@@ -2026,7 +2026,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             # <<<<<<<<<<<<<<
@@ -2039,7 +2039,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             # <<<<<<<<<<<<<<
@@ -2052,7 +2052,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 *             # <<<<<<<<<<<<<<
@@ -2064,7 +2064,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             # <<<<<<<<<<<<<<
@@ -2078,7 +2078,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             # <<<<<<<<<<<<<<
@@ -2098,7 +2098,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             # <<<<<<<<<<<<<<
@@ -2110,7 +2110,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             # <<<<<<<<<<<<<<
@@ -2122,12 +2122,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;
@@ -2139,7 +2139,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             # <<<<<<<<<<<<<<
@@ -2152,7 +2152,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             # <<<<<<<<<<<<<<
@@ -2165,7 +2165,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             # <<<<<<<<<<<<<<
@@ -2182,7 +2182,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             # <<<<<<<<<<<<<<
@@ -2194,7 +2194,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             # <<<<<<<<<<<<<<
@@ -2206,7 +2206,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 *             # <<<<<<<<<<<<<<
@@ -2220,7 +2220,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             # <<<<<<<<<<<<<<
@@ -2234,7 +2234,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 *             # <<<<<<<<<<<<<<
@@ -2246,7 +2246,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 *             # <<<<<<<<<<<<<<
@@ -3791,7 +3791,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*/
@@ -3950,6 +3949,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";
@@ -4243,6 +4243,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;
@@ -4511,6 +4512,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);
@@ -4757,6 +4759,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);
@@ -5117,6 +5120,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
@@ -5254,7 +5258,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 ### */
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
  *
  *         @property
  *         cdef inline PyObject* base(self) nogil:             # <<<<<<<<<<<<<<
@@ -5265,7 +5269,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":248
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":248
  *             """Returns a borrowed reference to the object owning the data/memory.
  *             """
  *             return PyArray_BASE(self)             # <<<<<<<<<<<<<<
@@ -5275,7 +5279,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   __pyx_r = PyArray_BASE(__pyx_v_self);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":245
  *
  *         @property
  *         cdef inline PyObject* base(self) nogil:             # <<<<<<<<<<<<<<
@@ -5288,7 +5292,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_7ndarray_4base_base(PyArrayObject
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
  *
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -5302,7 +5306,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   PyArray_Descr *__pyx_t_1;
   __Pyx_RefNannySetupContext("descr", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":254
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":254
  *             """Returns an owned reference to the dtype of the array.
  *             """
  *             return <dtype>PyArray_DESCR(self)             # <<<<<<<<<<<<<<
@@ -5315,7 +5319,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   __pyx_r = ((PyArray_Descr *)__pyx_t_1);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":251
  *
  *         @property
  *         cdef inline dtype descr(self):             # <<<<<<<<<<<<<<
@@ -5330,7 +5334,7 @@ static CYTHON_INLINE PyArray_Descr *__pyx_f_5numpy_7ndarray_5descr_descr(PyArray
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
  *
  *         @property
  *         cdef inline int ndim(self) nogil:             # <<<<<<<<<<<<<<
@@ -5341,7 +5345,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":260
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":260
  *             """Returns the number of dimensions in the array.
  *             """
  *             return PyArray_NDIM(self)             # <<<<<<<<<<<<<<
@@ -5351,7 +5355,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   __pyx_r = PyArray_NDIM(__pyx_v_self);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":257
  *
  *         @property
  *         cdef inline int ndim(self) nogil:             # <<<<<<<<<<<<<<
@@ -5364,7 +5368,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_7ndarray_4ndim_ndim(PyArrayObject *__pyx
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
  *
  *         @property
  *         cdef inline npy_intp *shape(self) nogil:             # <<<<<<<<<<<<<<
@@ -5375,7 +5379,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":268
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":268
  *             Can return NULL for 0-dimensional arrays.
  *             """
  *             return PyArray_DIMS(self)             # <<<<<<<<<<<<<<
@@ -5385,7 +5389,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   __pyx_r = PyArray_DIMS(__pyx_v_self);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":263
  *
  *         @property
  *         cdef inline npy_intp *shape(self) nogil:             # <<<<<<<<<<<<<<
@@ -5398,7 +5402,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_5shape_shape(PyArrayObjec
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
  *
  *         @property
  *         cdef inline npy_intp *strides(self) nogil:             # <<<<<<<<<<<<<<
@@ -5409,7 +5413,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":275
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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)             # <<<<<<<<<<<<<<
@@ -5419,7 +5423,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   __pyx_r = PyArray_STRIDES(__pyx_v_self);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":271
  *
  *         @property
  *         cdef inline npy_intp *strides(self) nogil:             # <<<<<<<<<<<<<<
@@ -5432,7 +5436,7 @@ static CYTHON_INLINE npy_intp *__pyx_f_5numpy_7ndarray_7strides_strides(PyArrayO
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
  *
  *         @property
  *         cdef inline npy_intp size(self) nogil:             # <<<<<<<<<<<<<<
@@ -5443,7 +5447,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":281
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":281
  *             """Returns the total size (in number of elements) of the array.
  *             """
  *             return PyArray_SIZE(self)             # <<<<<<<<<<<<<<
@@ -5453,7 +5457,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   __pyx_r = PyArray_SIZE(__pyx_v_self);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":278
  *
  *         @property
  *         cdef inline npy_intp size(self) nogil:             # <<<<<<<<<<<<<<
@@ -5466,7 +5470,7 @@ static CYTHON_INLINE npy_intp __pyx_f_5numpy_7ndarray_4size_size(PyArrayObject *
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
  *
  *         @property
  *         cdef inline char* data(self) nogil:             # <<<<<<<<<<<<<<
@@ -5477,7 +5481,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":290
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":290
  *             of `PyArray_DATA()` instead, which returns a 'void*'.
  *             """
  *             return PyArray_BYTES(self)             # <<<<<<<<<<<<<<
@@ -5487,7 +5491,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   __pyx_r = PyArray_BYTES(__pyx_v_self);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":284
  *
  *         @property
  *         cdef inline char* data(self) nogil:             # <<<<<<<<<<<<<<
@@ -5500,7 +5504,7 @@ static CYTHON_INLINE char *__pyx_f_5numpy_7ndarray_4data_data(PyArrayObject *__p
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":773
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_cdouble     complex_t
  *
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -5517,7 +5521,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":774
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":774
  *
  * cdef inline object PyArray_MultiIterNew1(a):
  *     return PyArray_MultiIterNew(1, <void*>a)             # <<<<<<<<<<<<<<
@@ -5531,7 +5535,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":773
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":773
  * ctypedef npy_cdouble     complex_t
  *
  * cdef inline object PyArray_MultiIterNew1(a):             # <<<<<<<<<<<<<<
@@ -5550,7 +5554,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
  *     return PyArray_MultiIterNew(1, <void*>a)
  *
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -5567,7 +5571,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":777
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":777
  *
  * cdef inline object PyArray_MultiIterNew2(a, b):
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)             # <<<<<<<<<<<<<<
@@ -5581,7 +5585,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":776
  *     return PyArray_MultiIterNew(1, <void*>a)
  *
  * cdef inline object PyArray_MultiIterNew2(a, b):             # <<<<<<<<<<<<<<
@@ -5600,7 +5604,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  *
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -5617,7 +5621,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":780
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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)             # <<<<<<<<<<<<<<
@@ -5631,7 +5635,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":779
  *     return PyArray_MultiIterNew(2, <void*>a, <void*>b)
  *
  * cdef inline object PyArray_MultiIterNew3(a, b, c):             # <<<<<<<<<<<<<<
@@ -5650,7 +5654,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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):             # <<<<<<<<<<<<<<
@@ -5667,7 +5671,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":783
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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)             # <<<<<<<<<<<<<<
@@ -5681,7 +5685,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":782
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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):             # <<<<<<<<<<<<<<
@@ -5700,7 +5704,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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):             # <<<<<<<<<<<<<<
@@ -5717,7 +5721,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":786
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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)             # <<<<<<<<<<<<<<
@@ -5731,7 +5735,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   __pyx_t_1 = 0;
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":785
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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):             # <<<<<<<<<<<<<<
@@ -5750,7 +5754,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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):             # <<<<<<<<<<<<<<
@@ -5764,7 +5768,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("PyDataType_SHAPE", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
  *
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -5774,7 +5778,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   __pyx_t_1 = PyDataType_HASSUBARRAY(__pyx_v_d);
   if (__pyx_t_1) {
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":790
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":790
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):
  *         return <tuple>d.subarray.shape             # <<<<<<<<<<<<<<
@@ -5786,7 +5790,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape);
     goto __pyx_L0;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":789
  *
  * cdef inline tuple PyDataType_SHAPE(dtype d):
  *     if PyDataType_HASSUBARRAY(d):             # <<<<<<<<<<<<<<
@@ -5795,7 +5799,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
  */
   }
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":792
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":792
  *         return <tuple>d.subarray.shape
  *     else:
  *         return ()             # <<<<<<<<<<<<<<
@@ -5809,7 +5813,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
     goto __pyx_L0;
   }
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":788
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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):             # <<<<<<<<<<<<<<
@@ -5824,7 +5828,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":967
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":967
  *     int _import_umath() except -1
  *
  * cdef inline void set_array_base(ndarray arr, object base):             # <<<<<<<<<<<<<<
@@ -5838,7 +5842,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":968
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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!             # <<<<<<<<<<<<<<
@@ -5847,7 +5851,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
  */
   Py_INCREF(__pyx_v_base);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":969
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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)             # <<<<<<<<<<<<<<
@@ -5856,7 +5860,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)
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":967
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":967
  *     int _import_umath() except -1
  *
  * cdef inline void set_array_base(ndarray arr, object base):             # <<<<<<<<<<<<<<
@@ -5871,7 +5875,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a
   __pyx_L0:;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
  *     PyArray_SetBaseObject(arr, base)
  *
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -5886,7 +5890,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_array_base", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":972
  *
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)             # <<<<<<<<<<<<<<
@@ -5895,7 +5899,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   __pyx_v_base = PyArray_BASE(__pyx_v_arr);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -5905,7 +5909,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_t_1 = (__pyx_v_base == NULL);
   if (__pyx_t_1) {
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":974
  *     base = PyArray_BASE(arr)
  *     if base is NULL:
  *         return None             # <<<<<<<<<<<<<<
@@ -5916,7 +5920,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
     __pyx_r = Py_None; __Pyx_INCREF(Py_None);
     goto __pyx_L0;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":973
  * cdef inline object get_array_base(ndarray arr):
  *     base = PyArray_BASE(arr)
  *     if base is NULL:             # <<<<<<<<<<<<<<
@@ -5925,7 +5929,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
  */
   }
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":975
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":975
  *     if base is NULL:
  *         return None
  *     return <object>base             # <<<<<<<<<<<<<<
@@ -5937,7 +5941,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   __pyx_r = ((PyObject *)__pyx_v_base);
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":971
  *     PyArray_SetBaseObject(arr, base)
  *
  * cdef inline object get_array_base(ndarray arr):             # <<<<<<<<<<<<<<
@@ -5952,7 +5956,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":979
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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:             # <<<<<<<<<<<<<<
@@ -5976,7 +5980,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_array", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -5992,7 +5996,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":981
  * cdef inline int import_array() except -1:
  *     try:
  *         __pyx_import_array()             # <<<<<<<<<<<<<<
@@ -6001,7 +6005,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)
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6015,7 +6019,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":982
  *     try:
  *         __pyx_import_array()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -6030,7 +6034,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy.core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -6045,7 +6049,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     }
     goto __pyx_L5_except_error;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":980
  * # Cython code.
  * cdef inline int import_array() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6061,7 +6065,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
     __pyx_L8_try_end:;
   }
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":979
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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:             # <<<<<<<<<<<<<<
@@ -6084,7 +6088,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) {
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
  *         raise ImportError("numpy.core.multiarray failed to import")
  *
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -6108,7 +6112,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_umath", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
  *
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6124,7 +6128,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":987
  * cdef inline int import_umath() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -6133,7 +6137,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)
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
  *
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6147,7 +6151,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":988
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -6162,7 +6166,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -6177,7 +6181,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     }
     goto __pyx_L5_except_error;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":986
  *
  * cdef inline int import_umath() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6193,7 +6197,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
     __pyx_L8_try_end:;
   }
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":985
  *         raise ImportError("numpy.core.multiarray failed to import")
  *
  * cdef inline int import_umath() except -1:             # <<<<<<<<<<<<<<
@@ -6216,7 +6220,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) {
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
  *         raise ImportError("numpy.core.umath failed to import")
  *
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -6240,7 +6244,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("import_ufunc", 1);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
  *
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6256,7 +6260,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __Pyx_XGOTREF(__pyx_t_3);
     /*try:*/ {
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":993
  * cdef inline int import_ufunc() except -1:
  *     try:
  *         _import_umath()             # <<<<<<<<<<<<<<
@@ -6265,7 +6269,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)
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
  *
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6279,7 +6283,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     goto __pyx_L8_try_end;
     __pyx_L3_error:;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":994
  *     try:
  *         _import_umath()
  *     except Exception:             # <<<<<<<<<<<<<<
@@ -6294,7 +6298,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
       __Pyx_XGOTREF(__pyx_t_6);
       __Pyx_XGOTREF(__pyx_t_7);
-      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
+      /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":995
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -6309,7 +6313,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     }
     goto __pyx_L5_except_error;
-    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
+    /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":992
  *
  * cdef inline int import_ufunc() except -1:
  *     try:             # <<<<<<<<<<<<<<
@@ -6325,7 +6329,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
     __pyx_L8_try_end:;
   }
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":991
  *         raise ImportError("numpy.core.umath failed to import")
  *
  * cdef inline int import_ufunc() except -1:             # <<<<<<<<<<<<<<
@@ -6348,7 +6352,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) {
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
  *
  *
  * cdef inline bint is_timedelta64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6359,7 +6363,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1010
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1010
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type)             # <<<<<<<<<<<<<<
@@ -6369,7 +6373,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":998
  *
  *
  * cdef inline bint is_timedelta64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6382,7 +6386,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
  *
  *
  * cdef inline bint is_datetime64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6393,7 +6397,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1025
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1025
  *     bool
  *     """
  *     return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type)             # <<<<<<<<<<<<<<
@@ -6403,7 +6407,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1013
  *
  *
  * cdef inline bint is_datetime64_object(object obj):             # <<<<<<<<<<<<<<
@@ -6416,7 +6420,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
  *
  *
  * cdef inline npy_datetime get_datetime64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6427,7 +6431,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1035
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1035
  *     also needed.  That can be found using `get_datetime64_unit`.
  *     """
  *     return (<PyDatetimeScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -6437,7 +6441,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1028
  *
  *
  * cdef inline npy_datetime get_datetime64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6450,7 +6454,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
  *
  *
  * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6461,7 +6465,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1042
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1042
  *     returns the int64 value underlying scalar numpy timedelta64 object
  *     """
  *     return (<PyTimedeltaScalarObject*>obj).obval             # <<<<<<<<<<<<<<
@@ -6471,7 +6475,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval;
   goto __pyx_L0;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1038
  *
  *
  * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6484,7 +6488,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject
   return __pyx_r;
 }
-/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
+/* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
  *
  *
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -6495,7 +6499,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1049
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/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             # <<<<<<<<<<<<<<
@@ -6503,7 +6507,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;
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":1045
  *
  *
  * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil:             # <<<<<<<<<<<<<<
@@ -16376,12 +16380,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;
@@ -16521,8 +16525,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;
     }
@@ -16567,11 +16597,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
@@ -16584,10 +16614,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
@@ -16607,11 +16637,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;
@@ -16622,8 +16652,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;
     }
@@ -16656,8 +16712,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;
@@ -16754,12 +16836,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
  *
@@ -16777,15 +16859,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) {
@@ -16825,14 +16907,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) {
@@ -16843,17 +16925,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;
@@ -16865,17 +16947,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;
@@ -16897,14 +16979,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) {
@@ -16915,17 +16997,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;
@@ -16937,17 +17019,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;
@@ -16969,26 +17051,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) {
@@ -16999,17 +17081,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;
@@ -17021,17 +17103,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;
@@ -17053,14 +17135,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) {
@@ -17071,17 +17153,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;
@@ -17093,17 +17175,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;
@@ -17125,14 +17207,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) {
@@ -17143,17 +17225,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;
@@ -17165,17 +17247,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;
@@ -17197,14 +17279,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) {
@@ -17215,17 +17297,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;
@@ -17237,17 +17319,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;
@@ -17269,14 +17351,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;
@@ -17290,35 +17372,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:;
@@ -17331,16 +17413,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
@@ -17355,7 +17437,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:;
@@ -17661,8 +17743,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;
@@ -17808,8 +17890,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;
     }
@@ -17854,11 +17962,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
@@ -17871,10 +17979,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
@@ -17894,11 +18002,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;
@@ -17909,8 +18017,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;
     }
@@ -17943,8 +18077,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;
@@ -18040,12 +18200,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
  *
@@ -18078,14 +18238,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) {
@@ -18096,36 +18256,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":
@@ -18144,8 +18304,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:
@@ -18154,8 +18314,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;
@@ -18209,14 +18369,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) {
@@ -18227,36 +18387,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":
@@ -18275,8 +18435,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;
@@ -18289,21 +18449,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
@@ -18341,14 +18501,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) {
@@ -18359,36 +18519,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":
@@ -18407,8 +18567,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;
@@ -18423,10 +18583,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
@@ -18464,14 +18624,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) {
@@ -18484,34 +18644,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":
@@ -18530,8 +18690,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;
@@ -18546,10 +18706,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
@@ -18587,14 +18747,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) {
@@ -18605,36 +18765,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":
@@ -18653,8 +18813,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;
@@ -18669,10 +18829,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
@@ -18710,14 +18870,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) {
@@ -18730,34 +18890,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":
@@ -18776,8 +18936,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;
@@ -18792,10 +18952,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
@@ -18833,14 +18993,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) {
@@ -18851,36 +19011,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":
@@ -18899,8 +19059,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;
@@ -18915,10 +19075,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
@@ -18956,14 +19116,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)) {
@@ -18976,34 +19136,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":
@@ -19022,8 +19182,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;
@@ -19038,10 +19198,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
@@ -19080,35 +19240,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:;
@@ -19137,7 +19297,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:;
@@ -20620,6 +20780,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},
@@ -20729,7 +20890,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":983
  *         __pyx_import_array()
  *     except Exception:
  *         raise ImportError("numpy.core.multiarray failed to import")             # <<<<<<<<<<<<<<
@@ -20740,7 +20901,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple_);
   __Pyx_GIVEREF(__pyx_tuple_);
-  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-37rq6yar/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
+  /* "../../../../../private/var/folders/3s/vfzpb5r51gs6y328rmlgzm7c0000gn/T/pip-build-env-9ds25527/overlay/lib/python3.11/site-packages/numpy/__init__.cython-30.pxd":989
  *         _import_umath()
  *     except Exception:
  *         raise ImportError("numpy.core.umath failed to import")             # <<<<<<<<<<<<<<
@@ -21294,7 +21455,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;