fixed NumPy 1.6 broadcasting bug, groupby bugfix

Author: wesm

pandas/core/groupby.py

@@ -345,22 +345,22 @@ def transform(self, func):
             if not isinstance(group, list):
                 group = list(group)
 
+            subframe = self.obj.reindex(group)
+            subframe.groupName = val
+
             if self.axis == 0:
                 indexer, _ = common.get_indexer(self.obj.index,
                                                 subframe.index, None)
             else:
                 indexer, _ = common.get_indexer(self.obj.columns,
                                                 subframe.columns, None)
 
-            subframe = self.obj.reindex(group)
-            subframe.groupName = val
-
             try:
                 res = func(subframe)
             except Exception:
                 res = subframe.apply(func, axis=self.axis)
 
-            result_values[indexer] = res
+            result_values[indexer] = res.values
 
             # result[val] = res
 

pandas/core/panel.py

@@ -317,19 +317,18 @@ def __setitem__(self, key, value):
         if isinstance(value, DataFrame):
             value = value.reindex(index=self.major_axis,
                                   columns=self.minor_axis)
-
-            mat = value.values.reshape((1, N, K))
+            mat = value.values
 
         elif np.isscalar(value):
-            mat = np.empty((1, N, K), dtype=float)
+            mat = np.empty((N, K), dtype=float)
             mat.fill(value)
 
         if key in self.items:
             loc = self.items.indexMap[key]
             self.values[loc] = mat
         else:
             self.items = Index(list(self.items) + [key])
-
+            mat = mat.reshape((1, N, K))
             # Insert item at end of items for now
             self.values = np.row_stack((self.values, mat))
 

pandas/core/tests/test_frame.py

@@ -1209,7 +1209,7 @@ def test_groupby(self):
         for name, group in grouped:
             mean = group.mean()
             for idx in group.index:
-                self.assertEqual(transformed[idx], mean)
+                assert_almost_equal(transformed.xs(idx), mean)
 
         # iterate
         for weekday, group in grouped: