Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMPAT: dateutil fixups for 2.3 (GH9021, GH8639) #9036

Merged
merged 1 commit into from
Dec 7, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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