Skip to content

REF: Separate timezone-conversion from tslibs.conversion #25938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 5, 2019
7 changes: 5 additions & 2 deletions pandas/_libs/tslib.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ from pandas._libs.tslibs.timedeltas cimport cast_from_unit
from pandas._libs.tslibs.timezones cimport is_utc, is_tzlocal, get_dst_info
from pandas._libs.tslibs.timezones import UTC
from pandas._libs.tslibs.conversion cimport (
tz_convert_single, _TSObject, convert_datetime_to_tsobject,
get_datetime64_nanos, tz_convert_utc_to_tzlocal)
_TSObject, convert_datetime_to_tsobject,
get_datetime64_nanos)

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

from pandas._libs.tslibs.tzconversion cimport (
tz_convert_single, tz_convert_utc_to_tzlocal)


cdef inline object create_datetime_from_ts(
int64_t value, npy_datetimestruct dts,
Expand Down
3 changes: 2 additions & 1 deletion pandas/_libs/tslibs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-
# flake8: noqa

from .conversion import normalize_date, localize_pydatetime, tz_convert_single
from .conversion import normalize_date, localize_pydatetime
from .nattype import NaT, NaTType, iNaT, is_null_datetimelike
from .np_datetime import OutOfBoundsDatetime
from .period import Period, IncompatibleFrequency
from .timestamps import Timestamp
from .timedeltas import delta_to_nanoseconds, ints_to_pytimedelta, Timedelta
from .tzconversion import tz_convert_single
4 changes: 0 additions & 4 deletions pandas/_libs/tslibs/conversion.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@ cdef convert_to_tsobject(object ts, object tz, object unit,
cdef _TSObject convert_datetime_to_tsobject(datetime ts, object tz,
int32_t nanos=*)

cpdef int64_t tz_convert_single(int64_t val, object tz1, object tz2)

cdef int64_t get_datetime64_nanos(object val) except? -1

cpdef int64_t pydt_to_i8(object pydt) except? -1

cdef maybe_datetimelike_to_i8(object val)

cdef int64_t tz_convert_utc_to_tzlocal(int64_t utc_val, tzinfo tz)

cpdef datetime localize_pydatetime(datetime dt, object tz)
Loading