Skip to content

Commit 0b03130

Browse files
jbrockmendeljreback
authored andcommitted
REF: Separate timezone-conversion from tslibs.conversion (#25938)
1 parent 77713d5 commit 0b03130

12 files changed

+573
-531
lines changed

pandas/_libs/tslib.pyx

+5-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ from pandas._libs.tslibs.timedeltas cimport cast_from_unit
3131
from pandas._libs.tslibs.timezones cimport is_utc, is_tzlocal, get_dst_info
3232
from pandas._libs.tslibs.timezones import UTC
3333
from pandas._libs.tslibs.conversion cimport (
34-
tz_convert_single, _TSObject, convert_datetime_to_tsobject,
35-
get_datetime64_nanos, tz_convert_utc_to_tzlocal)
34+
_TSObject, convert_datetime_to_tsobject,
35+
get_datetime64_nanos)
3636

3737
# many modules still look for NaT and iNaT here despite them not being needed
3838
from pandas._libs.tslibs.nattype import nat_strings, iNaT # noqa:F821
@@ -44,6 +44,9 @@ from pandas._libs.tslibs.offsets cimport to_offset
4444
from pandas._libs.tslibs.timestamps cimport create_timestamp_from_ts
4545
from pandas._libs.tslibs.timestamps import Timestamp
4646

47+
from pandas._libs.tslibs.tzconversion cimport (
48+
tz_convert_single, tz_convert_utc_to_tzlocal)
49+
4750

4851
cdef inline object create_datetime_from_ts(
4952
int64_t value, npy_datetimestruct dts,

pandas/_libs/tslibs/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# -*- coding: utf-8 -*-
22
# flake8: noqa
33

4-
from .conversion import normalize_date, localize_pydatetime, tz_convert_single
4+
from .conversion import normalize_date, localize_pydatetime
55
from .nattype import NaT, NaTType, iNaT, is_null_datetimelike
66
from .np_datetime import OutOfBoundsDatetime
77
from .period import Period, IncompatibleFrequency
88
from .timestamps import Timestamp
99
from .timedeltas import delta_to_nanoseconds, ints_to_pytimedelta, Timedelta
10+
from .tzconversion import tz_convert_single

pandas/_libs/tslibs/conversion.pxd

-4
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,10 @@ cdef convert_to_tsobject(object ts, object tz, object unit,
2121
cdef _TSObject convert_datetime_to_tsobject(datetime ts, object tz,
2222
int32_t nanos=*)
2323

24-
cpdef int64_t tz_convert_single(int64_t val, object tz1, object tz2)
25-
2624
cdef int64_t get_datetime64_nanos(object val) except? -1
2725

2826
cpdef int64_t pydt_to_i8(object pydt) except? -1
2927

3028
cdef maybe_datetimelike_to_i8(object val)
3129

32-
cdef int64_t tz_convert_utc_to_tzlocal(int64_t utc_val, tzinfo tz)
33-
3430
cpdef datetime localize_pydatetime(datetime dt, object tz)

0 commit comments

Comments
 (0)