Skip to content

Commit 73ca1f9

Browse files
committed
Merge pull request #9036 from jreback/dateutil_fix
COMPAT: dateutil fixups for 2.3 (GH9021, GH8639)
2 parents 7dbcb4c + 4e4640f commit 73ca1f9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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.tz.gettz('Europe/Brussels'))
107+
self.assertEqual(p.tz, dateutil.zoneinfo.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.tz.gettz('Europe/Brussels'))
112+
self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))
113113

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

pandas/tslib.pyx

+6-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,12 @@ cimport cython
3737

3838
from datetime import timedelta, datetime
3939
from datetime import time as datetime_time
40+
41+
# dateutil compat
4042
from dateutil.tz import (tzoffset, tzlocal as _dateutil_tzlocal, tzfile as _dateutil_tzfile,
41-
tzutc as _dateutil_tzutc, gettz as _dateutil_gettz)
43+
tzutc as _dateutil_tzutc)
44+
from dateutil.zoneinfo import gettz as _dateutil_gettz
45+
4246
from pytz.tzinfo import BaseTzInfo as _pytz_BaseTzInfo
4347
from pandas.compat import parse_date, string_types, PY3, iteritems
4448

@@ -1258,7 +1262,7 @@ cpdef inline object maybe_get_tz(object tz):
12581262
if isinstance(tz, string_types):
12591263
if tz.startswith('dateutil/'):
12601264
zone = tz[9:]
1261-
tz = _dateutil_gettz(tz[9:])
1265+
tz = _dateutil_gettz(zone)
12621266
# On Python 3 on Windows, the filename is not always set correctly.
12631267
if isinstance(tz, _dateutil_tzfile) and '.tar.gz' in tz._filename:
12641268
tz._filename = zone

0 commit comments

Comments
 (0)