Merge pull request #2950 from jreback/intna_2746

BUG: in-place conversion of integer series to float (on putmasking), GH #2746.

Author: jreback

RELEASE.rst

@@ -120,9 +120,12 @@ pandas 0.11.0
     - Support null checking on timedelta64, representing (and formatting) with NaT
     - Support setitem with np.nan value, converts to NaT
 
+  - Bug on in-place putmasking on an ``integer`` series that needs to be converted to ``float`` (GH2746_)
+
 .. _GH622: https://github.com/pydata/pandas/issues/622
 .. _GH797: https://github.com/pydata/pandas/issues/797
 .. _GH2681: https://github.com/pydata/pandas/issues/2681
+.. _GH2746: https://github.com/pydata/pandas/issues/2746
 .. _GH2747: https://github.com/pydata/pandas/issues/2747
 .. _GH2751: https://github.com/pydata/pandas/issues/2751
 .. _GH2776: https://github.com/pydata/pandas/issues/2776

pandas/core/common.py

@@ -722,6 +722,20 @@ def _maybe_promote(dtype, fill_value=np.nan):
     return dtype, fill_value
 
 
+def _maybe_upcast_putmask(result, mask, other):
+    """ a safe version of put mask that (potentially upcasts the result
+        return the result and a changed flag """
+    try:
+        np.putmask(result, mask, other)
+    except:
+        # our type is wrong here, need to upcast
+        if (-mask).any():
+            result, fill_value = _maybe_upcast(result, copy=True)
+            np.putmask(result, mask, other)
+            return result, True
+
+    return result, False
+
 def _maybe_upcast(values, fill_value=np.nan, copy=False):
     """ provide explicty type promotion and coercion
         if copy == True, then a copy is created even if no upcast is required """

pandas/core/frame.py

@@ -201,7 +201,7 @@ def na_op(x, y):
                 mask = notnull(xrav)
                 result[mask] = op(xrav[mask], y)
 
-            np.putmask(result, -mask, NA)
+            result, changed = com._maybe_upcast_putmask(result,-mask,np.nan)
             result = result.reshape(x.shape)
 
         return result

pandas/core/series.py

@@ -70,7 +70,8 @@ def na_op(x, y):
             else:
                 mask = notnull(x)
                 result[mask] = op(x[mask], y)
-            np.putmask(result, -mask, pa.NA)
+
+            result, changed = com._maybe_upcast_putmask(result,-mask,pa.NA)
 
         return result
 
@@ -680,7 +681,13 @@ def where(self, cond, other=nan, inplace=False):
         if len(other) != len(ser):
             raise ValueError('Length of replacements must equal series length')
 
-        np.putmask(ser, ~cond, other)
+        result, changed = com._maybe_upcast_putmask(ser,~cond,other)
+        if changed:
+
+            # need to actually change ser here
+            if inplace:
+                ser.dtype = result.dtype
+                ser[:] = result
 
         return None if inplace else ser
 

pandas/tests/test_series.py

@@ -2943,6 +2943,17 @@ def test_asof_more(self):
         result = s.asof(s.index[0])
         self.assertEqual(result, s[0])
 
+    def test_cast_on_putmask(self):
+
+        # GH 2746
+
+        # need to upcast
+        s = Series([1,2],index=[1,2],dtype='int64')
+        s[[True, False]] = Series([0],index=[1],dtype='int64')
+        expected = Series([0,2],index=[1,2],dtype='float64')
+
+        assert_series_equal(s, expected)
+
     def test_astype_cast_nan_int(self):
         df = Series([1.0, 2.0, 3.0, np.nan])
         self.assertRaises(ValueError, df.astype, np.int64)