Skip to content

Commit 966d09e

Browse files
mroeschkejreback
authored andcommitted
CLN: Unused imports in tslibs (#26168)
1 parent 3ab84a0 commit 966d09e

File tree

7 files changed

+19
-26
lines changed

7 files changed

+19
-26
lines changed

pandas/_libs/tslibs/c_timestamp.pyx

+4-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ cimport numpy as cnp
2323
from numpy cimport int64_t, int8_t
2424
cnp.import_array()
2525

26-
from dateutil.tz import tzutc
27-
2826
from cpython.datetime cimport (datetime,
2927
PyDateTime_Check, PyDelta_Check,
3028
PyDateTime_IMPORT)
@@ -38,9 +36,9 @@ from pandas._libs.tslibs.fields import get_start_end_field, get_date_name_field
3836
from pandas._libs.tslibs.nattype cimport c_NaT as NaT
3937
from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime
4038
from pandas._libs.tslibs.np_datetime cimport (
41-
reverse_ops, cmp_scalar, npy_datetimestruct, dt64_to_dtstruct)
39+
reverse_ops, cmp_scalar)
4240
from pandas._libs.tslibs.timezones cimport (
43-
get_timezone, get_utcoffset, is_utc, tz_compare)
41+
get_timezone, is_utc, tz_compare)
4442
from pandas._libs.tslibs.timezones import UTC
4543
from pandas._libs.tslibs.tzconversion cimport tz_convert_single
4644

@@ -381,5 +379,6 @@ cdef class _Timestamp(datetime):
381379

382380
def timestamp(self):
383381
"""Return POSIX timestamp as float."""
384-
# py27 compat, see GH#17329
382+
# GH 17329
383+
# Note: Naive timestamps will not match datetime.stdlib
385384
return round(self.value / 1e9, 6)

pandas/_libs/tslibs/conversion.pyx

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,20 @@ import cython
33

44
import numpy as np
55
cimport numpy as cnp
6-
from numpy cimport uint8_t, int64_t, int32_t, intp_t, ndarray
6+
from numpy cimport int64_t, int32_t, intp_t, ndarray
77
cnp.import_array()
88

99
import pytz
10-
from dateutil.tz import tzutc
1110

1211
# stdlib datetime imports
1312
from datetime import time as datetime_time
1413
from cpython.datetime cimport (datetime, tzinfo,
1514
PyDateTime_Check, PyDate_Check,
16-
PyDateTime_IMPORT, PyDelta_Check)
15+
PyDateTime_IMPORT)
1716
PyDateTime_IMPORT
1817

1918
from pandas._libs.tslibs.c_timestamp cimport _Timestamp
2019

21-
from pandas._libs.tslibs.ccalendar import DAY_SECONDS, HOUR_SECONDS
22-
2320
from pandas._libs.tslibs.np_datetime cimport (
2421
check_dts_bounds, npy_datetimestruct, pandas_datetime_to_datetimestruct,
2522
_string_to_dts, npy_datetime, dt64_to_dtstruct, dtstruct_to_dt64,
@@ -42,7 +39,7 @@ from pandas._libs.tslibs.nattype cimport (
4239
NPY_NAT, checknull_with_nat, c_NaT as NaT)
4340

4441
from pandas._libs.tslibs.tzconversion import (
45-
tz_localize_to_utc, tz_convert, tz_convert_single)
42+
tz_localize_to_utc, tz_convert_single)
4643
from pandas._libs.tslibs.tzconversion cimport _tz_convert_tzlocal_utc
4744

4845
# ----------------------------------------------------------------------

pandas/_libs/tslibs/timedeltas.pyx

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import collections
33
import textwrap
44
import warnings
55

6-
import sys
7-
86
import cython
97

108
from cpython cimport Py_NE, Py_EQ, PyObject_RichCompare
@@ -14,7 +12,7 @@ cimport numpy as cnp
1412
from numpy cimport int64_t
1513
cnp.import_array()
1614

17-
from cpython.datetime cimport (datetime, timedelta,
15+
from cpython.datetime cimport (timedelta,
1816
PyDateTime_Check, PyDelta_Check,
1917
PyDateTime_IMPORT)
2018
PyDateTime_IMPORT

pandas/_libs/tslibs/timestamps.pyx

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ from pandas._libs.tslibs.conversion import normalize_i8_timestamps
2222
from pandas._libs.tslibs.conversion cimport (
2323
_TSObject, convert_to_tsobject,
2424
convert_datetime_to_tsobject)
25-
from pandas._libs.tslibs.fields import get_start_end_field, get_date_name_field
2625
from pandas._libs.tslibs.nattype cimport NPY_NAT, c_NaT as NaT
2726
from pandas._libs.tslibs.np_datetime cimport (
2827
check_dts_bounds, npy_datetimestruct, dt64_to_dtstruct)

pandas/core/arrays/datetimes.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from pandas._libs import lib, tslib
1111
from pandas._libs.tslibs import (
1212
NaT, Timestamp, ccalendar, conversion, fields, iNaT, normalize_date,
13-
resolution as libresolution, timezones)
13+
resolution as libresolution, timezones, tzconversion)
1414
import pandas.compat as compat
1515
from pandas.errors import PerformanceWarning
1616
from pandas.util._decorators import Appender
@@ -784,7 +784,7 @@ def _local_timestamps(self):
784784
This is used to calculate time-of-day information as if the timestamps
785785
were timezone-naive.
786786
"""
787-
return conversion.tz_convert(self.asi8, utc, self.tz)
787+
return tzconversion.tz_convert(self.asi8, utc, self.tz)
788788

789789
def tz_convert(self, tz):
790790
"""
@@ -1032,8 +1032,8 @@ def tz_localize(self, tz, ambiguous='raise', nonexistent='raise',
10321032

10331033
if self.tz is not None:
10341034
if tz is None:
1035-
new_dates = conversion.tz_convert(self.asi8, timezones.UTC,
1036-
self.tz)
1035+
new_dates = tzconversion.tz_convert(self.asi8, timezones.UTC,
1036+
self.tz)
10371037
else:
10381038
raise TypeError("Already tz-aware, use tz_convert to convert.")
10391039
else:

pandas/tests/tslibs/test_conversion.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from pytz import UTC
88

99
from pandas._libs.tslib import iNaT
10-
from pandas._libs.tslibs import conversion, timezones
10+
from pandas._libs.tslibs import conversion, timezones, tzconversion
1111

1212
from pandas import Timestamp, date_range
1313
import pandas.util.testing as tm
@@ -17,7 +17,7 @@ def _compare_utc_to_local(tz_didx):
1717
def f(x):
1818
return conversion.tz_convert_single(x, UTC, tz_didx.tz)
1919

20-
result = conversion.tz_convert(tz_didx.asi8, UTC, tz_didx.tz)
20+
result = tzconversion.tz_convert(tz_didx.asi8, UTC, tz_didx.tz)
2121
expected = np.vectorize(f)(tz_didx.asi8)
2222

2323
tm.assert_numpy_array_equal(result, expected)
@@ -27,7 +27,7 @@ def _compare_local_to_utc(tz_didx, utc_didx):
2727
def f(x):
2828
return conversion.tz_convert_single(x, tz_didx.tz, UTC)
2929

30-
result = conversion.tz_convert(utc_didx.asi8, tz_didx.tz, UTC)
30+
result = tzconversion.tz_convert(utc_didx.asi8, tz_didx.tz, UTC)
3131
expected = np.vectorize(f)(utc_didx.asi8)
3232

3333
tm.assert_numpy_array_equal(result, expected)
@@ -56,9 +56,9 @@ def test_tz_convert_single_matches_tz_convert(tz_aware_fixture, freq):
5656
pytest.param(np.array([], dtype=np.int64), id="empty"),
5757
pytest.param(np.array([iNaT], dtype=np.int64), id="all_nat")])
5858
def test_tz_convert_corner(arr):
59-
result = conversion.tz_convert(arr,
60-
timezones.maybe_get_tz("US/Eastern"),
61-
timezones.maybe_get_tz("Asia/Tokyo"))
59+
result = tzconversion.tz_convert(arr,
60+
timezones.maybe_get_tz("US/Eastern"),
61+
timezones.maybe_get_tz("Asia/Tokyo"))
6262
tm.assert_numpy_array_equal(result, arr)
6363

6464

pandas/tseries/frequencies.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
from pandas._libs.algos import unique_deltas
1010
from pandas._libs.tslibs import Timedelta, Timestamp
1111
from pandas._libs.tslibs.ccalendar import MONTH_ALIASES, int_to_weekday
12-
from pandas._libs.tslibs.conversion import tz_convert
1312
from pandas._libs.tslibs.fields import build_field_sarray
1413
import pandas._libs.tslibs.frequencies as libfreqs
1514
from pandas._libs.tslibs.offsets import _offset_to_period_map
1615
import pandas._libs.tslibs.resolution as libresolution
1716
from pandas._libs.tslibs.resolution import Resolution
1817
from pandas._libs.tslibs.timezones import UTC
18+
from pandas._libs.tslibs.tzconversion import tz_convert
1919
from pandas.util._decorators import cache_readonly
2020

2121
from pandas.core.dtypes.common import (

0 commit comments

Comments
 (0)