COMPAT: windows compat for #9838

Author: jreback

pandas/core/internals.py

@@ -676,7 +676,9 @@ def putmask(self, mask, new, align=True, inplace=False,
             # direction, then explictly repeat and reshape new instead
             if getattr(new, 'ndim', 0) >= 1:
                 if self.ndim - 1 == new.ndim and axis == 1:
-                    new = np.repeat(new, new_values.shape[-1]).reshape(self.shape)
+                    new = np.repeat(new, new_values.shape[-1]).reshape(
+                        self.shape)
+                new = new.astype(new_values.dtype)
 
             np.putmask(new_values, mask, new)
 

pandas/tests/test_frame.py

@@ -10144,8 +10144,8 @@ def test_align_multiindex(self):
         midx = pd.MultiIndex.from_product([range(2), range(3), range(2)],
                                  names=('a', 'b', 'c'))
         idx = pd.Index(range(2), name='b')
-        df1 = pd.DataFrame(np.arange(12), index=midx)
-        df2 = pd.DataFrame(np.arange(2), index=idx)
+        df1 = pd.DataFrame(np.arange(12,dtype='int64'), index=midx)
+        df2 = pd.DataFrame(np.arange(2,dtype='int64'), index=idx)
 
         # these must be the same results (but flipped)
         res1l, res1r = df1.align(df2, join='left')

pandas/tests/test_series.py

@@ -6357,8 +6357,8 @@ def test_align_multiindex(self):
         midx = pd.MultiIndex.from_product([range(2), range(3), range(2)],
                                  names=('a', 'b', 'c'))
         idx = pd.Index(range(2), name='b')
-        s1 = pd.Series(np.arange(12), index=midx)
-        s2 = pd.Series(np.arange(2), index=idx)
+        s1 = pd.Series(np.arange(12,dtype='int64'), index=midx)
+        s2 = pd.Series(np.arange(2,dtype='int64'), index=idx)
 
         # these must be the same results (but flipped)
         res1l, res1r = s1.align(s2, join='left')