BUG: Fix for fillna ignoring axis=1 parameter (issues #17399 #17409)

pandas/core/generic.py

@@ -6274,7 +6274,8 @@ def fillna(
                     )
 
                 new_data = self._data.fillna(
-                    value=value, limit=limit, inplace=inplace, downcast=downcast
+                    value=value, axis=axis, limit=limit, inplace=inplace,
+                    downcast=downcast
                 )
 
             elif isinstance(value, (dict, ABCSeries)):

pandas/core/internals/blocks.py

@@ -386,7 +386,7 @@ def apply(self, func, **kwargs):
 
         return result
 
-    def fillna(self, value, limit=None, inplace=False, downcast=None):
+    def fillna(self, value, axis=0, limit=None, inplace=False, downcast=None):
         """ fillna on the block with the value. If we fail, then convert to
         ObjectBlock and try again
         """
@@ -398,13 +398,10 @@ def fillna(self, value, limit=None, inplace=False, downcast=None):
                 raise ValueError("Limit must be an integer")
             if limit < 1:
                 raise ValueError("Limit must be greater than 0")
-            mask[mask.cumsum(self.ndim - 1) > limit] = False
+            mask[mask.cumsum(int(axis == 0 and self.ndim > 1)) > limit] = False
 
         if not self._can_hold_na:
-            if inplace:
-                return self
-            else:
-                return self.copy()
+            return self if inplace else self.copy()
 
         if self._can_hold_element(value):
             # equivalent: _try_coerce_args(value) would not raise
@@ -1842,7 +1839,7 @@ def concat_same_type(self, to_concat, placement=None):
         placement = placement or slice(0, len(values), 1)
         return self.make_block_same_class(values, ndim=self.ndim, placement=placement)
 
-    def fillna(self, value, limit=None, inplace=False, downcast=None):
+    def fillna(self, value, axis=0, limit=None, inplace=False, downcast=None):
         values = self.values if inplace else self.values.copy()
         values = values.fillna(value=value, limit=limit)
         return [
@@ -2406,15 +2403,15 @@ def concat_same_type(self, to_concat, placement=None):
             return ObjectBlock(values, ndim=self.ndim, placement=placement)
         return super().concat_same_type(to_concat, placement)
 
-    def fillna(self, value, limit=None, inplace=False, downcast=None):
+    def fillna(self, value, axis=0, limit=None, inplace=False, downcast=None):
         # We support filling a DatetimeTZ with a `value` whose timezone
         # is different by coercing to object.
         if self._can_hold_element(value):
-            return super().fillna(value, limit, inplace, downcast)
+            return super().fillna(value, axis, limit, inplace, downcast)
 
         # different timezones, or a non-tz
         return self.astype(object).fillna(
-            value, limit=limit, inplace=inplace, downcast=downcast
+            value, axis=axis, limit=limit, inplace=inplace, downcast=downcast
         )
 
     def setitem(self, indexer, value):

pandas/tests/frame/test_missing.py

@@ -671,6 +671,14 @@ def test_fillna_columns(self):
         expected = df.astype(float).fillna(method="ffill", axis=1)
         assert_frame_equal(result, expected)
 
+    def test_fillna_columns(self):
+        df = DataFrame(np.random.randn(10, 4))
+        df.iloc[1:4, 1:4] = nan
+        expected = df.copy()
+        expected.iloc[1:4, 1:4] = 0
+        result = df.fillna(value=0, axis=1)
+        tm.assert_frame_equal(result, expected)
+
     def test_fillna_invalid_method(self, float_frame):
         with pytest.raises(ValueError, match="ffil"):
             float_frame.fillna(method="ffil")