move Localizer to tzconversion

pandas/_libs/tslibs/timezones.pxd

@@ -3,11 +3,6 @@ from cpython.datetime cimport (
     timedelta,
     tzinfo,
 )
-from numpy cimport (
-    int64_t,
-    intp_t,
-    ndarray,
-)
 
 
 cdef tzinfo utc_pytz
@@ -25,20 +20,3 @@ cdef timedelta get_utcoffset(tzinfo tz, datetime obj)
 cdef bint is_fixed_offset(tzinfo tz)
 
 cdef object get_dst_info(tzinfo tz)
-
-
-cdef class Localizer:
-    cdef:
-        tzinfo tz
-        bint use_utc
-        bint use_fixed
-        bint use_tzlocal
-        bint use_dst
-        bint use_pytz
-        ndarray trans
-        int64_t[:] deltas
-        int64_t delta
-        str typ
-
-    cdef int64_t prepare1(self, int64_t utc_val)
-    cdef intp_t* prepare(self, const int64_t[:] stamps)

pandas/_libs/tslibs/timezones.pyx

@@ -28,10 +28,7 @@ UTC = pytz.utc
 import numpy as np
 
 cimport numpy as cnp
-from numpy cimport (
-    int64_t,
-    intp_t,
-)
+from numpy cimport int64_t
 
 cnp.import_array()
 
@@ -411,48 +408,3 @@ def tz_standardize(tz: tzinfo) -> tzinfo:
     if treat_tz_as_pytz(tz):
         return pytz.timezone(str(tz))
     return tz
-
-
-@cython.freelist(16)
-cdef class Localizer:
-    # cdef:
-    #    tzinfo tz
-    #    bint use_utc
-    #    bint use_fixed
-    #    bint use_tzlocal
-    #    bint use_pytz
-    #    bint use_dst
-    #    ndarray trans
-    #    int64_t[:] deltas
-    #    int64_t delta
-    #    str typ
-
-    def __cinit__(self, tzinfo tz):
-        self.tz = tz
-        if is_utc(tz) or tz is None:
-            self.use_utc = True
-        elif is_tzlocal(tz):
-            self.use_tzlocal = True
-        else:
-            trans, deltas, typ = get_dst_info(tz)
-            self.trans = trans
-            self.deltas = deltas
-            self.typ = typ
-
-            if typ not in ["pytz", "dateutil"]:
-                # static/fixed; in this case we know that len(delta) == 1
-                self.use_fixed = True
-                self.delta = deltas[0]
-            else:
-                self.use_dst = True
-                if typ == "pytz":
-                    self.use_pytz = True
-
-    cdef int64_t prepare1(self, int64_t utc_val):
-        if self.use_dst:
-            return self.trans.searchsorted(utc_val, side="right") - 1
-
-    cdef intp_t* prepare(self, const int64_t[:] stamps):
-        if self.use_dst:
-
-            return <intp_t*>cnp.PyArray_DATA(self.trans.searchsorted(stamps, side="right") - 1)

pandas/_libs/tslibs/tzconversion.pxd

@@ -2,10 +2,9 @@ from cpython.datetime cimport tzinfo
 from numpy cimport (
     int64_t,
     intp_t,
+    ndarray,
 )
 
-from pandas._libs.tslibs.timezones cimport Localizer
-
 
 cdef int64_t tz_convert_utc_to_tzlocal(
     int64_t utc_val, tzinfo tz, bint* fold=*
@@ -16,4 +15,21 @@ cdef int64_t tz_localize_to_utc_single(
 ) except? -1
 
 
+cdef class Localizer:
+    cdef:
+        tzinfo tz
+        bint use_utc
+        bint use_fixed
+        bint use_tzlocal
+        bint use_dst
+        bint use_pytz
+        ndarray trans
+        int64_t[:] deltas
+        int64_t delta
+        str typ
+
+    cdef int64_t prepare1(self, int64_t utc_val)
+    cdef intp_t* prepare(self, const int64_t[:] stamps)
+
+
 cdef int64_t utc_val_to_local_val(Localizer info, int64_t utc_val, intp_t* pos, Py_ssize_t i)

pandas/_libs/tslibs/tzconversion.pyx

@@ -38,7 +38,6 @@ from pandas._libs.tslibs.np_datetime cimport (
     npy_datetimestruct,
 )
 from pandas._libs.tslibs.timezones cimport (
-    Localizer,
     get_dst_info,
     get_utcoffset,
     is_fixed_offset,
@@ -542,6 +541,51 @@ cdef int64_t _tz_convert_tzlocal_utc(int64_t val, tzinfo tz, bint to_utc=True,
         return val + delta
 
 
+@cython.freelist(16)
+cdef class Localizer:
+    # cdef:
+    #    tzinfo tz
+    #    bint use_utc
+    #    bint use_fixed
+    #    bint use_tzlocal
+    #    bint use_pytz
+    #    bint use_dst
+    #    ndarray trans
+    #    int64_t[:] deltas
+    #    int64_t delta
+    #    str typ
+
+    def __cinit__(self, tzinfo tz):
+        self.tz = tz
+        if is_utc(tz) or tz is None:
+            self.use_utc = True
+        elif is_tzlocal(tz):
+            self.use_tzlocal = True
+        else:
+            trans, deltas, typ = get_dst_info(tz)
+            self.trans = trans
+            self.deltas = deltas
+            self.typ = typ
+
+            if typ not in ["pytz", "dateutil"]:
+                # static/fixed; in this case we know that len(delta) == 1
+                self.use_fixed = True
+                self.delta = deltas[0]
+            else:
+                self.use_dst = True
+                if typ == "pytz":
+                    self.use_pytz = True
+
+    cdef int64_t prepare1(self, int64_t utc_val):
+        if self.use_dst:
+            return self.trans.searchsorted(utc_val, side="right") - 1
+
+    cdef intp_t* prepare(self, const int64_t[:] stamps):
+        if self.use_dst:
+
+            return <intp_t*>cnp.PyArray_DATA(self.trans.searchsorted(stamps, side="right") - 1)
+
+
 # TODO: make this a Localizer method? would require moving tzlocal func
 cdef int64_t utc_val_to_local_val(Localizer info, int64_t utc_val, intp_t* pos, Py_ssize_t i):
     cdef:

pandas/_libs/tslibs/vectorized.pyx

@@ -31,13 +31,12 @@ from .offsets cimport BaseOffset
 from .period cimport get_period_ordinal
 from .timestamps cimport create_timestamp_from_ts
 from .timezones cimport (
-    Localizer,
     get_dst_info,
     is_tzlocal,
     is_utc,
 )
 from .tzconversion cimport (
-    tz_convert_utc_to_tzlocal,
+    Localizer,
     utc_val_to_local_val,
 )