BUG: fix issue with concat of localized timestamps

closes #12467 closes #12462
pandas-dev · Apr 6, 2016 · e04f343 · e04f343
1 parent 1fe02d5
commit e04f343
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/doc/source/whatsnew/v0.18.1.txt b/doc/source/whatsnew/v0.18.1.txt
@@ -192,7 +192,7 @@ Bug Fixes
 
 
 - Bug in ``.drop()`` with a non-unique ``MultiIndex``. (:issue:`12701`)
-
+- Bug in ``.concat`` of datetime tz-aware and naive DataFrames (:issue:`12467`)
 
 
 - Bug in ``Timestamp.__repr__`` that caused ``pprint`` to fail in nested structures (:issue:`12622`)

diff --git a/pandas/tests/frame/test_combine_concat.py b/pandas/tests/frame/test_combine_concat.py
@@ -46,6 +46,29 @@ def test_combine_multiple_frames_dtypes(self):
         expected = Series(dict(float64=2, float32=2))
         assert_series_equal(results, expected)
 
+    def test_combine_multiple_tzs(self):
+        # GH 12467
+        # combining datetime tz-aware and naive DataFrames
+        ts1 = Timestamp('2015-01-01', tz=None)
+        ts2 = Timestamp('2015-01-01', tz='UTC')
+        ts3 = Timestamp('2015-01-01', tz='EST')
+
+        df1 = DataFrame(dict(time=[ts1]))
+        df2 = DataFrame(dict(time=[ts2]))
+        df3 = DataFrame(dict(time=[ts3]))
+
+        results = pd.concat([df1, df2]).reset_index(drop=True)
+        expected = DataFrame(dict(time=[ts1, ts2]), dtype=object)
+        assert_frame_equal(results, expected)
+
+        results = pd.concat([df1, df3]).reset_index(drop=True)
+        expected = DataFrame(dict(time=[ts1, ts3]), dtype=object)
+        assert_frame_equal(results, expected)
+
+        results = pd.concat([df2, df3]).reset_index(drop=True)
+        expected = DataFrame(dict(time=[ts2, ts3]))
+        assert_frame_equal(results, expected)
+
     def test_append_series_dict(self):
         df = DataFrame(np.random.randn(5, 4),
                        columns=['foo', 'bar', 'baz', 'qux'])

diff --git a/pandas/tseries/common.py b/pandas/tseries/common.py
@@ -260,7 +260,7 @@ def convert_to_pydatetime(x, axis):
         # if dtype is of datetimetz or timezone
         if x.dtype.kind == _NS_DTYPE.kind:
             if getattr(x, 'tz', None) is not None:
-                x = x.asobject
+                x = x.asobject.values
             else:
                 shape = x.shape
                 x = tslib.ints_to_pydatetime(x.view(np.int64).ravel())
@@ -271,6 +271,8 @@ def convert_to_pydatetime(x, axis):
             x = tslib.ints_to_pytimedelta(x.view(np.int64).ravel())
             x = x.reshape(shape)
 
+        if axis == 1:
+            x = np.atleast_2d(x)
         return x
 
     if typs is None: