|
16 | 16 |
|
17 | 17 | import pandas.util.testing as tm
|
18 | 18 | from pandas.tseries import offsets, frequencies
|
19 |
| -from pandas._libs.tslibs.timezones import get_timezone |
20 |
| -from pandas._libs.tslibs import conversion, period |
| 19 | +from pandas._libs import period |
| 20 | +from pandas._libs.tslibs.timezones import get_timezone, dateutil_gettz as gettz |
| 21 | +from pandas._libs.tslibs import conversion |
21 | 22 |
|
22 | 23 | from pandas.compat import long, PY3
|
23 | 24 | from pandas.util.testing import assert_series_equal
|
@@ -359,9 +360,7 @@ def test_conversion(self):
|
359 | 360 | '2014-01-01 00:00:00.000000001'])
|
360 | 361 | def test_repr(self, date, freq):
|
361 | 362 | # dateutil zone change (only matters for repr)
|
362 |
| - if (dateutil.__version__ >= LooseVersion('2.3') and |
363 |
| - (dateutil.__version__ <= LooseVersion('2.4.0') or |
364 |
| - dateutil.__version__ >= LooseVersion('2.6.0'))): |
| 363 | + if dateutil.__version__ >= LooseVersion('2.6.0'): |
365 | 364 | timezones = ['UTC', 'Asia/Tokyo', 'US/Eastern',
|
366 | 365 | 'dateutil/US/Pacific']
|
367 | 366 | else:
|
@@ -1381,7 +1380,6 @@ def test_timestamp_to_datetime_explicit_pytz(self):
|
1381 | 1380 | def test_timestamp_to_datetime_explicit_dateutil(self):
|
1382 | 1381 | tm._skip_if_windows_python_3()
|
1383 | 1382 |
|
1384 |
| - from pandas._libs.tslibs.timezones import dateutil_gettz as gettz |
1385 | 1383 | stamp = Timestamp('20090415', tz=gettz('US/Eastern'), freq='D')
|
1386 | 1384 | dtval = stamp.to_pydatetime()
|
1387 | 1385 | assert stamp == dtval
|
|
0 commit comments