Skip to content

Commit

Permalink
COMPAT: dateutil fixups for 2.3 (GH9021, GH8639)
Browse files Browse the repository at this point in the history
  • Loading branch information
jreback committed Dec 7, 2014
1 parent 8e3b2fe commit 4e4640f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pandas/tseries/tests/test_period.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ def test_timestamp_tz_arg_dateutil(self):
import dateutil
from pandas.tslib import maybe_get_tz
p = Period('1/1/2005', freq='M').to_timestamp(tz=maybe_get_tz('dateutil/Europe/Brussels'))
self.assertEqual(p.tz, dateutil.tz.gettz('Europe/Brussels'))
self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))

def test_timestamp_tz_arg_dateutil_from_string(self):
import dateutil
p = Period('1/1/2005', freq='M').to_timestamp(tz='dateutil/Europe/Brussels')
self.assertEqual(p.tz, dateutil.tz.gettz('Europe/Brussels'))
self.assertEqual(p.tz, dateutil.zoneinfo.gettz('Europe/Brussels'))

def test_timestamp_nat_tz(self):
t = Period('NaT', freq='M').to_timestamp()
Expand Down
8 changes: 6 additions & 2 deletions pandas/tslib.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@ cimport cython

from datetime import timedelta, datetime
from datetime import time as datetime_time

# dateutil compat
from dateutil.tz import (tzoffset, tzlocal as _dateutil_tzlocal, tzfile as _dateutil_tzfile,
tzutc as _dateutil_tzutc, gettz as _dateutil_gettz)
tzutc as _dateutil_tzutc)
from dateutil.zoneinfo import gettz as _dateutil_gettz

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

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

0 comments on commit 4e4640f

Please sign in to comment.