7
7
from pytz import UTC
8
8
9
9
from pandas ._libs .tslib import iNaT
10
- from pandas ._libs .tslibs import conversion , timezones
10
+ from pandas ._libs .tslibs import conversion , timezones , tzconversion
11
11
12
12
from pandas import Timestamp , date_range
13
13
import pandas .util .testing as tm
@@ -17,7 +17,7 @@ def _compare_utc_to_local(tz_didx):
17
17
def f (x ):
18
18
return conversion .tz_convert_single (x , UTC , tz_didx .tz )
19
19
20
- result = conversion .tz_convert (tz_didx .asi8 , UTC , tz_didx .tz )
20
+ result = tzconversion .tz_convert (tz_didx .asi8 , UTC , tz_didx .tz )
21
21
expected = np .vectorize (f )(tz_didx .asi8 )
22
22
23
23
tm .assert_numpy_array_equal (result , expected )
@@ -27,7 +27,7 @@ def _compare_local_to_utc(tz_didx, utc_didx):
27
27
def f (x ):
28
28
return conversion .tz_convert_single (x , tz_didx .tz , UTC )
29
29
30
- result = conversion .tz_convert (utc_didx .asi8 , tz_didx .tz , UTC )
30
+ result = tzconversion .tz_convert (utc_didx .asi8 , tz_didx .tz , UTC )
31
31
expected = np .vectorize (f )(utc_didx .asi8 )
32
32
33
33
tm .assert_numpy_array_equal (result , expected )
@@ -56,9 +56,9 @@ def test_tz_convert_single_matches_tz_convert(tz_aware_fixture, freq):
56
56
pytest .param (np .array ([], dtype = np .int64 ), id = "empty" ),
57
57
pytest .param (np .array ([iNaT ], dtype = np .int64 ), id = "all_nat" )])
58
58
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" ))
62
62
tm .assert_numpy_array_equal (result , arr )
63
63
64
64
0 commit comments