Merge pull request #5716 from pydata/winfix4

TST/DOC: close win32 tests issues (GH5711)

Author: jreback

pandas/core/generic.py

@@ -1830,23 +1830,24 @@ def fillna(self, value=None, method=None, axis=0, inplace=False,
             Method to use for filling holes in reindexed Series
             pad / ffill: propagate last valid observation forward to next valid
             backfill / bfill: use NEXT valid observation to fill gap
-        value : scalar or dict
-            Value to use to fill holes (e.g. 0), alternately a dict of values
-            specifying which value to use for each column (columns not in the
-            dict will not be filled). This value cannot be a list.
+        value : scalar, dict, or Series
+            Value to use to fill holes (e.g. 0), alternately a dict/Series of 
+            values specifying which value to use for each index (for a Series) or 
+            column (for a DataFrame). (values not in the dict/Series will not be 
+            filled). This value cannot be a list.
         axis : {0, 1}, default 0
             0: fill column-by-column
             1: fill row-by-row
         inplace : boolean, default False
             If True, fill in place. Note: this will modify any
             other views on this object, (e.g. a no-copy slice for a column in a
-            DataFrame).  Still returns the object.
+            DataFrame).
         limit : int, default None
             Maximum size gap to forward or backward fill
-        downcast : dict, default is None, a dict of item->dtype of what to
-            downcast if possible, or the string 'infer' which will try to
-            downcast to an appropriate equal type (e.g. float64 to int64 if
-            possible)
+        downcast : dict, default is None
+             a dict of item->dtype of what to downcast if possible, 
+            or the string 'infer' which will try to downcast to an appropriate 
+            equal type (e.g. float64 to int64 if possible)
 
         See also
         --------

pandas/tests/test_indexing.py

@@ -1382,7 +1382,7 @@ def test_astype_assignment(self):
         df_orig = DataFrame([['1','2','3','.4',5,6.,'foo']],columns=list('ABCDEFG'))
 
         df = df_orig.copy()
-        df.iloc[:,0:2] = df.iloc[:,0:2].astype(int)
+        df.iloc[:,0:2] = df.iloc[:,0:2].astype(np.int64)
         expected = DataFrame([[1,2,'3','.4',5,6.,'foo']],columns=list('ABCDEFG'))
         assert_frame_equal(df,expected)
 
@@ -1393,12 +1393,12 @@ def test_astype_assignment(self):
 
         # GH5702 (loc)
         df = df_orig.copy()
-        df.loc[:,'A'] = df.loc[:,'A'].astype(int)
+        df.loc[:,'A'] = df.loc[:,'A'].astype(np.int64)
         expected = DataFrame([[1,'2','3','.4',5,6.,'foo']],columns=list('ABCDEFG'))
         assert_frame_equal(df,expected)
 
         df = df_orig.copy()
-        df.loc[:,['B','C']] = df.loc[:,['B','C']].astype(int)
+        df.loc[:,['B','C']] = df.loc[:,['B','C']].astype(np.int64)
         expected =  DataFrame([['1',2,3,'.4',5,6.,'foo']],columns=list('ABCDEFG'))
         assert_frame_equal(df,expected)
 

pandas/tests/test_series.py

@@ -1345,7 +1345,7 @@ def f():
 
         s[0:3] = list(range(3))
         expected = Series([0,1,2])
-        assert_series_equal(s, expected)
+        assert_series_equal(s.astype(np.int64), expected, )
 
         # slice with step
         s = Series(list('abcdef'))