From 02dade9cdcf56f224d514c83f09060a95cb3b6c3 Mon Sep 17 00:00:00 2001 From: Gjelt Date: Sun, 22 Apr 2018 23:08:39 +0200 Subject: [PATCH 1/2] CLN: removed long deprecated input param 'axis' in .replace() --- pandas/core/generic.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 86342b6996abf..b7a223f32d301 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -5539,9 +5539,6 @@ def bfill(self, axis=None, inplace=False, limit=None, downcast=None): .. versionchanged:: 0.23.0 Added to DataFrame. - axis : None - .. deprecated:: 0.13.0 - Has no effect and will be removed. See Also -------- @@ -5749,15 +5746,11 @@ def bfill(self, axis=None, inplace=False, limit=None, downcast=None): @Appender(_shared_docs['replace'] % _shared_doc_kwargs) def replace(self, to_replace=None, value=None, inplace=False, limit=None, - regex=False, method='pad', axis=None): + regex=False, method='pad'): inplace = validate_bool_kwarg(inplace, 'inplace') if not is_bool(regex) and to_replace is not None: raise AssertionError("'to_replace' must be 'None' if 'regex' is " "not a bool") - if axis is not None: - warnings.warn('the "axis" argument is deprecated ' - 'and will be removed in' - 'v0.13; this argument has no effect') self._consolidate_inplace() From c51213d9e11180126029ea84f23ac2aa5282decb Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Wed, 2 May 2018 06:09:39 -0400 Subject: [PATCH 2/2] fixup --- doc/source/whatsnew/v0.23.0.txt | 1 + pandas/core/frame.py | 4 ++-- pandas/core/series.py | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/source/whatsnew/v0.23.0.txt b/doc/source/whatsnew/v0.23.0.txt index c194d98a89789..3320bd224d5fb 100644 --- a/doc/source/whatsnew/v0.23.0.txt +++ b/doc/source/whatsnew/v0.23.0.txt @@ -1019,6 +1019,7 @@ Removal of prior version deprecations/changes ``ambiguous='infer'``, and ``infer_dst=False`` to ``ambiguous='raise'`` (:issue:`7963`). - When ``.resample()`` was changed from an eager to a lazy operation, like ``.groupby()`` in v0.18.0, we put in place compatibility (with a ``FutureWarning``), so operations would continue to work. This is now fully removed, so a ``Resampler`` will no longer forward compat operations (:issue:`20554`) +- Remove long deprecated ``axis=None`` parameter from ``.replace()`` (:issue:`20271`) .. _whatsnew_0230.performance: diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 83d6dee64c165..7a2bd2708b711 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -3790,11 +3790,11 @@ def fillna(self, value=None, method=None, axis=None, inplace=False, @Appender(_shared_docs['replace'] % _shared_doc_kwargs) def replace(self, to_replace=None, value=None, inplace=False, limit=None, - regex=False, method='pad', axis=None): + regex=False, method='pad'): return super(DataFrame, self).replace(to_replace=to_replace, value=value, inplace=inplace, limit=limit, regex=regex, - method=method, axis=axis) + method=method) @Appender(_shared_docs['shift'] % _shared_doc_kwargs) def shift(self, periods=1, freq=None, axis=0): diff --git a/pandas/core/series.py b/pandas/core/series.py index 2bf96ddaedf6f..951227f381b1c 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -3423,11 +3423,10 @@ def fillna(self, value=None, method=None, axis=None, inplace=False, @Appender(generic._shared_docs['replace'] % _shared_doc_kwargs) def replace(self, to_replace=None, value=None, inplace=False, limit=None, - regex=False, method='pad', axis=None): + regex=False, method='pad'): return super(Series, self).replace(to_replace=to_replace, value=value, inplace=inplace, limit=limit, - regex=regex, method=method, - axis=axis) + regex=regex, method=method) @Appender(generic._shared_docs['shift'] % _shared_doc_kwargs) def shift(self, periods=1, freq=None, axis=0):