diff --git a/pandas/io/pytables.py b/pandas/io/pytables.py index 0411934b9ef87..0fff14013efe4 100644 --- a/pandas/io/pytables.py +++ b/pandas/io/pytables.py @@ -1801,7 +1801,7 @@ def convert(self, values, nan_rep, encoding): elif dtype == u('date'): try: self.data = np.array( - [date.fromordinal(v) for v in data], dtype=object) + [date.fromordinal(v) for v in self.data], dtype=object) except (ValueError): self.data = np.array( [date.fromtimestamp(v) for v in self.data], dtype=object) @@ -3882,7 +3882,7 @@ def _unconvert_index(data, kind, encoding=None): [date.fromordinal(v) for v in data], dtype=object) except (ValueError): index = np.array( - [date.fromtimestamp(v) for v in self.data], dtype=object) + [date.fromtimestamp(v) for v in data], dtype=object) elif kind in (u('integer'), u('float')): index = np.array(data) elif kind in (u('string')): diff --git a/pandas/io/tests/test_pytables.py b/pandas/io/tests/test_pytables.py index 835198400cd5a..4f03f29d77ea3 100644 --- a/pandas/io/tests/test_pytables.py +++ b/pandas/io/tests/test_pytables.py @@ -1809,6 +1809,16 @@ def test_store_timezone(self): import time import os + # original method + with ensure_clean(self.path) as store: + + today = datetime.date(2013,9,10) + df = DataFrame([1,2,3], index = [today, today, today]) + store['obj1'] = df + result = store['obj1'] + assert_frame_equal(result, df) + + # with tz setting orig_tz = os.environ.get('TZ') def setTZ(tz):