From da3025ae6dec3fed73df0cf1d1bbc5ef0d816695 Mon Sep 17 00:00:00 2001 From: Natalia Mokeeva Date: Sun, 30 Oct 2022 17:19:39 +0100 Subject: [PATCH 1/2] enable pylint:useless-return --- pandas/core/arrays/_mixins.py | 1 - pandas/core/arrays/base.py | 1 - pandas/core/missing.py | 4 ---- pandas/tests/groupby/test_apply.py | 2 +- pyproject.toml | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pandas/core/arrays/_mixins.py b/pandas/core/arrays/_mixins.py index fefc220403b9d..35f1ace7ec351 100644 --- a/pandas/core/arrays/_mixins.py +++ b/pandas/core/arrays/_mixins.py @@ -304,7 +304,6 @@ def _fill_mask_inplace( # (for now) when self.ndim == 2, we assume axis=0 func = missing.get_fill_func(method, ndim=self.ndim) func(self._ndarray.T, limit=limit, mask=mask.T) - return @doc(ExtensionArray.fillna) def fillna( diff --git a/pandas/core/arrays/base.py b/pandas/core/arrays/base.py index 60772cbcc30a1..cc9b2ce3fed42 100644 --- a/pandas/core/arrays/base.py +++ b/pandas/core/arrays/base.py @@ -1556,7 +1556,6 @@ def _fill_mask_inplace( func(npvalues, limit=limit, mask=mask.copy()) new_values = self._from_sequence(npvalues, dtype=self.dtype) self[mask] = new_values[mask] - return def _rank( self, diff --git a/pandas/core/missing.py b/pandas/core/missing.py index 6ad8403c62720..0d058ead9d22c 100644 --- a/pandas/core/missing.py +++ b/pandas/core/missing.py @@ -258,7 +258,6 @@ def interpolate_array_2d( fill_value=fill_value, **kwargs, ) - return def _interpolate_2d_with_fill( @@ -341,7 +340,6 @@ def func(yvalues: np.ndarray) -> None: # Sequence[Sequence[Sequence[_SupportsArray[dtype[]]]]], # Sequence[Sequence[Sequence[Sequence[_SupportsArray[dtype[]]]]]]]]" np.apply_along_axis(func, axis, data) # type: ignore[arg-type] - return def _index_to_interp_indices(index: Index, method: str) -> np.ndarray: @@ -762,8 +760,6 @@ def _interpolate_with_limit_area( values[invalid] = np.nan - return - def interpolate_2d( values: np.ndarray, diff --git a/pandas/tests/groupby/test_apply.py b/pandas/tests/groupby/test_apply.py index 0cd89a205bb82..ba1ea3c2cf892 100644 --- a/pandas/tests/groupby/test_apply.py +++ b/pandas/tests/groupby/test_apply.py @@ -148,7 +148,7 @@ def f_scalar(group): names.append(group.name) return 0 - def f_none(group): + def f_none(group): # pylint: disable= "useless-return" # GH10519, GH12155, GH21417 names.append(group.name) return None diff --git a/pyproject.toml b/pyproject.toml index 0ce8cf87ab17e..c4e8984d07100 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -135,7 +135,6 @@ disable = [ "unnecessary-list-index-lookup", "use-a-generator", "useless-option-value", - "useless-return", # pylint type "W": warning, for python specific problems "abstract-method", From 26dcc12545889abd29f5f2a23d412d3efde070bd Mon Sep 17 00:00:00 2001 From: Natalia Mokeeva Date: Sun, 30 Oct 2022 19:23:41 +0100 Subject: [PATCH 2/2] fixup! enable pylint:useless-return --- pandas/tests/groupby/test_apply.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/groupby/test_apply.py b/pandas/tests/groupby/test_apply.py index ba1ea3c2cf892..935c39af8af3a 100644 --- a/pandas/tests/groupby/test_apply.py +++ b/pandas/tests/groupby/test_apply.py @@ -148,10 +148,9 @@ def f_scalar(group): names.append(group.name) return 0 - def f_none(group): # pylint: disable= "useless-return" + def f_none(group): # GH10519, GH12155, GH21417 names.append(group.name) - return None def f_constant_df(group): # GH2936, GH20084