Merge branch 'deck-shim-159447397' into rel-5.2.276

Crunch-io · Aug 23, 2018 · ddbf93d · ddbf93d
2 parents c329763 + 20e4d73
commit ddbf93d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/cr/cube/crunch_cube.py b/src/cr/cube/crunch_cube.py
@@ -383,6 +383,9 @@ def _inserted_dim_inds(self, transform_dims, axis):
     def _margin_pruned_indices(margin, inserted_ind, axis):
         pruned_ind = np.logical_or(margin == 0, np.isnan(margin))
 
+        if pruned_ind.ndim == 0:
+            pruned_ind = np.array([pruned_ind])
+
         if np.any(margin) and inserted_ind is not None and any(inserted_ind):
             ind_inserted = np.zeros(pruned_ind.shape, dtype=bool)
             if len(pruned_ind.shape) == 2 and axis == 1:
@@ -847,7 +850,11 @@ def hs_dims_for_den(hs_dims, axis):
             inflate_ind = [
                 (
                     None
-                    if d.is_mr_selections(self.all_dimensions) or n <= 1 else
+                    if (
+                        d.is_mr_selections(self.all_dimensions) or
+                        n <= 1 or
+                        len(d.elements()) <= 1
+                    ) else
                     slice(None)
                 )
                 for d, n in zip(self.all_dimensions, table.shape)