BUG: fix mixed-type concatenation panel4d test

Author: wesm

RELEASE.rst

@@ -170,6 +170,7 @@ pandas 0.10.0
   - Override ``Series.tolist`` and box datetime64 types (#2447)
   - Optimize ``unstack`` memory usage by compressing indices (#2278)
   - Fix HTML repr in IPython qtconsole if opening window is small (#2275)
+  - Escape more special characters in console output (#2492)
 
 **Bug fixes**
 

pandas/tools/merge.py

@@ -975,12 +975,12 @@ def _prepare_blocks(self):
             data = data.consolidate()
             type_map = dict((type(blk), blk) for blk in data.blocks)
             blockmaps.append(type_map)
-        return blockmaps
+        return blockmaps, reindexed_data
 
     def _get_concatenated_data(self):
         try:
             # need to conform to same other (joined) axes for block join
-            blockmaps = self._prepare_blocks()
+            blockmaps, rdata = self._prepare_blocks()
             kinds = _get_all_block_kinds(blockmaps)
 
             new_blocks = []
@@ -1004,7 +1004,7 @@ def _get_concatenated_data(self):
 
             new_data = {}
             for item in self.new_axes[0]:
-                new_data[item] = self._concat_single_item(item)
+                new_data[item] = self._concat_single_item(rdata, item)
 
         return new_data
 
@@ -1053,15 +1053,20 @@ def _concat_blocks(self, blocks):
 
             return make_block(concat_values, concat_items, self.new_axes[0])
 
-    def _concat_single_item(self, item):
+    def _concat_single_item(self, objs, item):
         all_values = []
         dtypes = set()
-        for obj in self.objs:
-            try:
-                values = obj._data.get(item)
+
+        # le sigh
+        if isinstance(self.objs[0], SparseDataFrame):
+            objs = [x._data for x in self.objs]
+
+        for data, orig in zip(objs, self.objs):
+            if item in orig:
+                values = data.get(item)
                 dtypes.add(values.dtype)
                 all_values.append(values)
-            except KeyError:
+            else:
                 all_values.append(None)
 
         # this stinks
@@ -1075,9 +1080,9 @@ def _concat_single_item(self, item):
             empty_dtype = np.float64
 
         to_concat = []
-        for obj, item_values in zip(self.objs, all_values):
+        for obj, item_values in zip(objs, all_values):
             if item_values is None:
-                shape = obj._data.shape[1:]
+                shape = obj.shape[1:]
                 missing_arr = np.empty(shape, dtype=empty_dtype)
                 missing_arr.fill(np.nan)
                 to_concat.append(missing_arr)

pandas/tools/tests/test_merge.py

@@ -1452,9 +1452,10 @@ def test_panel4d_concat_mixed_type(self):
 
         result = concat([p1, p2], axis=3)
 
-        expected = p4d.copy()
-        expected['L5'] = expected['L5'].astype('O')
-        expected.ix['L5', :, :, :2] = 'baz'
+        p2['L5'] = np.nan
+        expected = concat([p1, p2], axis=3)
+        expected = expected.ix[result.labels]
+
         tm.assert_panel4d_equal(result, expected)
 
     def test_concat_series(self):