Skip to content

Commit cf96024

Browse files
committed
Use tz.gettz() instead of zoneinfo.gettz()
zoneinfo.gettz() seems to have problems (1 & 2) on system which do not install the zoninfo tarball (e.g. Debian, Gentoo and Fedora) but rely on the system zoneinfo files. This results in test failures (3 & 4) tz.gettz() doesn't suffer from this problem. 1 dateutil/dateutil#8 2 dateutil/dateutil#11 3 #9059 4 #8639 Signed-off-by: Justin Lecher <[email protected]>
1 parent f9db166 commit cf96024

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

pandas/tests/test_series.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5398,7 +5398,7 @@ def test_getitem_setitem_datetime_tz_pytz(self):
53985398
def test_getitem_setitem_datetime_tz_dateutil(self):
53995399
tm._skip_if_no_dateutil();
54005400
from dateutil.tz import tzutc
5401-
from dateutil.zoneinfo import gettz
5401+
from dateutil.tz import gettz
54025402
tz = lambda x: tzutc() if x == 'UTC' else gettz(x) # handle special case for utc in dateutil
54035403

54045404
from pandas import date_range

pandas/tseries/tests/test_daterange.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ def test_month_range_union_tz_pytz(self):
441441
def test_month_range_union_tz_dateutil(self):
442442
_skip_if_windows_python_3()
443443
tm._skip_if_no_dateutil()
444-
from dateutil.zoneinfo import gettz as timezone
444+
from dateutil.tz import gettz as timezone
445445
tz = timezone('US/Eastern')
446446

447447
early_start = datetime(2011, 1, 1)

pandas/tseries/tests/test_period.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ def test_timestamp_tz_arg_dateutil(self):
104104
import dateutil
105105
from pandas.tslib import maybe_get_tz
106106
p = Period('1/1/2005', freq='M').to_timestamp(tz=maybe_get_tz('dateutil/Europe/Brussels'))
107-
self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
107+
self.assertEqual(p.tz, dateutil.tz.gettz('Europe/Brussels'))
108108

109109
def test_timestamp_tz_arg_dateutil_from_string(self):
110110
import dateutil
111111
p = Period('1/1/2005', freq='M').to_timestamp(tz='dateutil/Europe/Brussels')
112-
self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
112+
self.assertEqual(p.tz, dateutil.tz.gettz('Europe/Brussels'))
113113

114114
def test_timestamp_nat_tz(self):
115115
t = Period('NaT', freq='M').to_timestamp()

pandas/tseries/tests/test_timeseries.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ def test_timestamp_to_datetime_explicit_dateutil(self):
419419
tm._skip_if_no_dateutil()
420420
import dateutil
421421
rng = date_range('20090415', '20090519',
422-
tz=dateutil.zoneinfo.gettz('US/Eastern'))
422+
tz=dateutil.tz.gettz('US/Eastern'))
423423

424424
stamp = rng[0]
425425
dtval = stamp.to_pydatetime()
@@ -1807,7 +1807,7 @@ def test_append_concat_tz_explicit_pytz(self):
18071807
def test_append_concat_tz_dateutil(self):
18081808
# GH 2938
18091809
tm._skip_if_no_dateutil()
1810-
from dateutil.zoneinfo import gettz as timezone
1810+
from dateutil.tz import gettz as timezone
18111811

18121812
rng = date_range('5/8/2012 1:45', periods=10, freq='5T',
18131813
tz='dateutil/US/Eastern')

pandas/tslib.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ from datetime import time as datetime_time
4141
# dateutil compat
4242
from dateutil.tz import (tzoffset, tzlocal as _dateutil_tzlocal, tzfile as _dateutil_tzfile,
4343
tzutc as _dateutil_tzutc)
44-
from dateutil.zoneinfo import gettz as _dateutil_gettz
44+
from dateutil.tz import gettz as _dateutil_gettz
4545

4646
from pytz.tzinfo import BaseTzInfo as _pytz_BaseTzInfo
4747
from pandas.compat import parse_date, string_types, PY3, iteritems

0 commit comments

Comments
 (0)