From d96a44d187c05e96f25c94220160e8c2a53fa1c8 Mon Sep 17 00:00:00 2001 From: Thierry Moisan Date: Tue, 25 Oct 2022 22:06:54 -0400 Subject: [PATCH 1/2] STYLE: fix pylint simplifiable-if-statement warnings --- pandas/core/dtypes/dtypes.py | 10 ++-------- pandas/io/formats/info.py | 10 ++-------- pandas/tests/tseries/offsets/test_week.py | 6 +----- pyproject.toml | 1 - 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/pandas/core/dtypes/dtypes.py b/pandas/core/dtypes/dtypes.py index cd1753bc8fec1..69f70e2d4ed2f 100644 --- a/pandas/core/dtypes/dtypes.py +++ b/pandas/core/dtypes/dtypes.py @@ -986,10 +986,7 @@ def is_dtype(cls, dtype: object) -> bool: # but doesn't regard freq str like "U" as dtype. if dtype.startswith("period[") or dtype.startswith("Period["): try: - if cls._parse_dtype_strict(dtype) is not None: - return True - else: - return False + return bool(cls._parse_dtype_strict(dtype) is not None) except ValueError: return False else: @@ -1254,10 +1251,7 @@ def is_dtype(cls, dtype: object) -> bool: if isinstance(dtype, str): if dtype.lower().startswith("interval"): try: - if cls.construct_from_string(dtype) is not None: - return True - else: - return False + return bool(cls.construct_from_string(dtype) is not None) except (ValueError, TypeError): return False else: diff --git a/pandas/io/formats/info.py b/pandas/io/formats/info.py index e0f6e01a65052..b05b8e0e0fb90 100644 --- a/pandas/io/formats/info.py +++ b/pandas/io/formats/info.py @@ -500,10 +500,7 @@ def non_null_counts(self) -> Sequence[int]: @property def memory_usage_bytes(self) -> int: - if self.memory_usage == "deep": - deep = True - else: - deep = False + deep = bool(self.memory_usage == "deep") return self.data.memory_usage(index=True, deep=deep).sum() def render( @@ -579,10 +576,7 @@ def memory_usage_bytes(self) -> int: memory_usage_bytes : int Object's total memory usage in bytes. """ - if self.memory_usage == "deep": - deep = True - else: - deep = False + deep = bool(self.memory_usage == "deep") return self.data.memory_usage(index=True, deep=deep) diff --git a/pandas/tests/tseries/offsets/test_week.py b/pandas/tests/tseries/offsets/test_week.py index 51eb662967db6..07c86a3de6de4 100644 --- a/pandas/tests/tseries/offsets/test_week.py +++ b/pandas/tests/tseries/offsets/test_week.py @@ -114,11 +114,7 @@ def test_is_on_offset(self, weekday): for day in range(1, 8): date = datetime(2008, 1, day) - - if day % 7 == weekday: - expected = True - else: - expected = False + expected = bool(day % 7 == weekday) assert_is_on_offset(offset, date, expected) @pytest.mark.parametrize( diff --git a/pyproject.toml b/pyproject.toml index f2ebed97bed50..b6c657dfd8b15 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,6 @@ disable = [ "no-self-use", "redefined-argument-from-local", "simplifiable-if-expression", - "simplifiable-if-statement", "too-few-public-methods", "too-many-ancestors", "too-many-arguments", From 008566168a417ee9a0aa1ccc5391ba01530324ae Mon Sep 17 00:00:00 2001 From: Thierry Moisan Date: Tue, 25 Oct 2022 23:59:55 -0400 Subject: [PATCH 2/2] fixup! STYLE: fix pylint simplifiable-if-statement warnings --- pandas/core/dtypes/dtypes.py | 4 ++-- pandas/io/formats/info.py | 4 ++-- pandas/tests/tseries/offsets/test_week.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/core/dtypes/dtypes.py b/pandas/core/dtypes/dtypes.py index 69f70e2d4ed2f..85b1a2a61012a 100644 --- a/pandas/core/dtypes/dtypes.py +++ b/pandas/core/dtypes/dtypes.py @@ -986,7 +986,7 @@ def is_dtype(cls, dtype: object) -> bool: # but doesn't regard freq str like "U" as dtype. if dtype.startswith("period[") or dtype.startswith("Period["): try: - return bool(cls._parse_dtype_strict(dtype) is not None) + return cls._parse_dtype_strict(dtype) is not None except ValueError: return False else: @@ -1251,7 +1251,7 @@ def is_dtype(cls, dtype: object) -> bool: if isinstance(dtype, str): if dtype.lower().startswith("interval"): try: - return bool(cls.construct_from_string(dtype) is not None) + return cls.construct_from_string(dtype) is not None except (ValueError, TypeError): return False else: diff --git a/pandas/io/formats/info.py b/pandas/io/formats/info.py index b05b8e0e0fb90..96b96f31792cc 100644 --- a/pandas/io/formats/info.py +++ b/pandas/io/formats/info.py @@ -500,7 +500,7 @@ def non_null_counts(self) -> Sequence[int]: @property def memory_usage_bytes(self) -> int: - deep = bool(self.memory_usage == "deep") + deep = self.memory_usage == "deep" return self.data.memory_usage(index=True, deep=deep).sum() def render( @@ -576,7 +576,7 @@ def memory_usage_bytes(self) -> int: memory_usage_bytes : int Object's total memory usage in bytes. """ - deep = bool(self.memory_usage == "deep") + deep = self.memory_usage == "deep" return self.data.memory_usage(index=True, deep=deep) diff --git a/pandas/tests/tseries/offsets/test_week.py b/pandas/tests/tseries/offsets/test_week.py index 07c86a3de6de4..f42ff091af277 100644 --- a/pandas/tests/tseries/offsets/test_week.py +++ b/pandas/tests/tseries/offsets/test_week.py @@ -114,7 +114,7 @@ def test_is_on_offset(self, weekday): for day in range(1, 8): date = datetime(2008, 1, day) - expected = bool(day % 7 == weekday) + expected = day % 7 == weekday assert_is_on_offset(offset, date, expected) @pytest.mark.parametrize(