Revert changes in Block.whare

Author: Licht-T

pandas/core/internals.py

@@ -47,7 +47,6 @@
     find_common_type)
 from pandas.core.dtypes.missing import (
     isna, notna, array_equivalent,
-    na_value_for_dtype,
     _isna_compat,
     is_null_datelike_scalar)
 import pandas.core.dtypes.concat as _concat
@@ -445,18 +444,14 @@ def make_a_block(nv, ref_loc):
                 except (AttributeError, NotImplementedError):
                     pass
 
-                if isinstance(self, SparseBlock):
-                    block = self.make_block_same_class(values=nv,
-                                                       placement=ref_loc,
-                                                       fastpath=True)
-                else:
-                    block = self.make_block(values=nv,
-                                            placement=ref_loc,
-                                            fastpath=True)
+                block = self.make_block(values=nv,
+                                        placement=ref_loc,
+                                        fastpath=True)
+
             return block
 
         # ndim == 1
-        if self.ndim == 1 or isinstance(self, SparseBlock):
+        if self.ndim == 1:
             if mask.any():
                 nv = f(mask, new_values, None)
             else:
@@ -1405,8 +1400,6 @@ def where(self, other, cond, align=True, raise_on_error=True,
         if not hasattr(cond, 'shape'):
             raise ValueError("where must have a condition that is ndarray "
                              "like")
-        else:
-            cond = cond.reshape(values.shape)
 
         # our where function
         def func(cond, values, other):
@@ -1453,13 +1446,7 @@ def func(cond, values, other):
             if try_cast:
                 result = self._try_cast_result(result)
 
-            if isinstance(self, SparseBlock):
-                fill_value = na_value_for_dtype(result.dtype)
-                return self.make_block_same_class(result,
-                                                  self.mgr_locs,
-                                                  fill_value=fill_value)
-            else:
-                return self.make_block(result)
+            return self.make_block(result)
 
         # might need to separate out blocks
         axis = cond.ndim - 1
@@ -1582,10 +1569,6 @@ def _nanpercentile(values, q, axis, **kw):
         result = self._try_coerce_result(result)
         if is_scalar(result):
             return ax, self.make_block_scalar(result)
-
-        if isinstance(self, SparseBlock):
-            result = SparseArray(result.flatten())
-
         return ax, make_block(result,
                               placement=np.arange(len(result)),
                               ndim=ndim)