77from pytz import UTC
88
99from pandas ._libs .tslib import iNaT
10- from pandas ._libs .tslibs import conversion , timezones
10+ from pandas ._libs .tslibs import conversion , timezones , tzconversion
1111
1212from pandas import Timestamp , date_range
1313import 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" )])
5858def 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
0 commit comments