Skip to content

Commit 5d7e992

Browse files
committed
TST: fix up tzlocal test cases
1 parent 9da3e3d commit 5d7e992

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

pandas/io/tests/test_parsers.py

+9-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from pandas.util import py3compat
2222
from pandas.lib import Timestamp
2323
from pandas.tseries.index import date_range
24+
import pandas.tseries.tools as tools
2425

2526
from numpy.testing.decorators import slow
2627
from pandas.io.date_converters import (
@@ -1490,7 +1491,14 @@ def test_parse_tz_aware(self):
14901491
result = read_csv(data, index_col=0, parse_dates=True)
14911492
stamp = result.index[0]
14921493
self.assert_(stamp.minute == 39)
1493-
self.assert_(result.index.tz is pytz.utc)
1494+
try:
1495+
self.assert_(result.index.tz is pytz.utc)
1496+
except AssertionError: # hello Yaroslav
1497+
arr = result.index.to_pydatetime()
1498+
result = tools.to_datetime(arr, utc=True)[0]
1499+
self.assert_(stamp.minute == result.minute)
1500+
self.assert_(stamp.hour == result.hour)
1501+
self.assert_(stamp.day == result.day)
14941502

14951503
class TestParseSQL(unittest.TestCase):
14961504

pandas/tseries/tests/test_timezones.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -433,11 +433,10 @@ def test_to_datetime_tzlocal(self):
433433
self.assert_(result.tz is pytz.utc)
434434

435435
rng = date_range('2012-11-03 03:00', '2012-11-05 03:00', tz=tzlocal())
436-
rs1 = rng.to_pydatetime()
437-
result = to_datetime(np.array(result.asobject), utc=True)
436+
arr = rng.to_pydatetime()
437+
result = to_datetime(arr, utc=True)
438438
self.assert_(result.tz is pytz.utc)
439439

440-
441440
def test_frame_no_datetime64_dtype(self):
442441
dr = date_range('2011/1/1', '2012/1/1', freq='W-FRI')
443442
dr_tz = dr.tz_localize('US/Eastern')

0 commit comments

Comments
 (0)