Skip to content

Commit fa557f7

Browse files
jbrockmendeljreback
authored andcommitted
De-privatize timezone funcs (#17502)
1 parent eef810e commit fa557f7

File tree

6 files changed

+75
-79
lines changed

6 files changed

+75
-79
lines changed

pandas/_libs/index.pyx

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cimport tslib
1717

1818
from hashtable cimport HashTable
1919

20-
from tslibs.timezones cimport _is_utc
20+
from tslibs.timezones cimport is_utc, get_utcoffset
2121
from pandas._libs import tslib, algos, hashtable as _hash
2222
from pandas._libs.tslib import Timestamp, Timedelta
2323
from datetime import datetime, timedelta
@@ -551,8 +551,8 @@ cdef inline _to_i8(object val):
551551
tzinfo = getattr(val, 'tzinfo', None)
552552
# Save the original date value so we can get the utcoffset from it.
553553
ival = _pydatetime_to_dts(val, &dts)
554-
if tzinfo is not None and not _is_utc(tzinfo):
555-
offset = tslib._get_utcoffset(tzinfo, val)
554+
if tzinfo is not None and not is_utc(tzinfo):
555+
offset = get_utcoffset(tzinfo, val)
556556
ival -= tslib._delta_to_nanoseconds(offset)
557557
return ival
558558
return val

pandas/_libs/period.pyx

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ from lib cimport is_null_datetimelike, is_period
3434
from pandas._libs import tslib, lib
3535
from pandas._libs.tslib import (Timedelta, Timestamp, iNaT,
3636
NaT)
37-
from tslibs.timezones cimport _is_utc, _is_tzlocal, _get_utcoffset
37+
from tslibs.timezones cimport is_utc, is_tzlocal, get_utcoffset
3838
from tslib cimport (
3939
maybe_get_tz,
4040
_get_dst_info,
@@ -533,23 +533,23 @@ cdef _reso_local(ndarray[int64_t] stamps, object tz):
533533
ndarray[int64_t] trans, deltas, pos
534534
pandas_datetimestruct dts
535535

536-
if _is_utc(tz):
536+
if is_utc(tz):
537537
for i in range(n):
538538
if stamps[i] == NPY_NAT:
539539
continue
540540
pandas_datetime_to_datetimestruct(stamps[i], PANDAS_FR_ns, &dts)
541541
curr_reso = _reso_stamp(&dts)
542542
if curr_reso < reso:
543543
reso = curr_reso
544-
elif _is_tzlocal(tz):
544+
elif is_tzlocal(tz):
545545
for i in range(n):
546546
if stamps[i] == NPY_NAT:
547547
continue
548548
pandas_datetime_to_datetimestruct(stamps[i], PANDAS_FR_ns,
549549
&dts)
550550
dt = datetime(dts.year, dts.month, dts.day, dts.hour,
551551
dts.min, dts.sec, dts.us, tz)
552-
delta = int(_get_utcoffset(tz, dt).total_seconds()) * 1000000000
552+
delta = int(get_utcoffset(tz, dt).total_seconds()) * 1000000000
553553
pandas_datetime_to_datetimestruct(stamps[i] + delta,
554554
PANDAS_FR_ns, &dts)
555555
curr_reso = _reso_stamp(&dts)
@@ -597,7 +597,7 @@ cdef ndarray[int64_t] localize_dt64arr_to_period(ndarray[int64_t] stamps,
597597
ndarray[int64_t] trans, deltas, pos
598598
pandas_datetimestruct dts
599599

600-
if _is_utc(tz):
600+
if is_utc(tz):
601601
for i in range(n):
602602
if stamps[i] == NPY_NAT:
603603
result[i] = NPY_NAT
@@ -607,7 +607,7 @@ cdef ndarray[int64_t] localize_dt64arr_to_period(ndarray[int64_t] stamps,
607607
dts.hour, dts.min, dts.sec,
608608
dts.us, dts.ps, freq)
609609

610-
elif _is_tzlocal(tz):
610+
elif is_tzlocal(tz):
611611
for i in range(n):
612612
if stamps[i] == NPY_NAT:
613613
result[i] = NPY_NAT
@@ -616,7 +616,7 @@ cdef ndarray[int64_t] localize_dt64arr_to_period(ndarray[int64_t] stamps,
616616
&dts)
617617
dt = datetime(dts.year, dts.month, dts.day, dts.hour,
618618
dts.min, dts.sec, dts.us, tz)
619-
delta = int(_get_utcoffset(tz, dt).total_seconds()) * 1000000000
619+
delta = int(get_utcoffset(tz, dt).total_seconds()) * 1000000000
620620
pandas_datetime_to_datetimestruct(stamps[i] + delta,
621621
PANDAS_FR_ns, &dts)
622622
result[i] = get_period_ordinal(dts.year, dts.month, dts.day,

pandas/_libs/src/inference.pyx

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ from decimal import Decimal
33
cimport util
44
cimport cython
55
from tslib import NaT
6-
from tslibs.timezones cimport _get_zone
6+
from tslibs.timezones cimport get_timezone
77
from datetime import datetime, timedelta
88
iNaT = util.get_nat()
99

@@ -901,13 +901,13 @@ cpdef bint is_datetime_with_singletz_array(ndarray[object] values):
901901
for i in range(n):
902902
base_val = values[i]
903903
if base_val is not NaT:
904-
base_tz = _get_zone(getattr(base_val, 'tzinfo', None))
904+
base_tz = get_timezone(getattr(base_val, 'tzinfo', None))
905905

906906
for j in range(i, n):
907907
val = values[j]
908908
if val is not NaT:
909909
tz = getattr(val, 'tzinfo', None)
910-
if base_tz != tz and base_tz != _get_zone(tz):
910+
if base_tz != tz and base_tz != get_timezone(tz):
911911
return False
912912
break
913913

0 commit comments

Comments
 (0)