From 6ee6b72758554467c6746982583d4b4fc37a3a22 Mon Sep 17 00:00:00 2001 From: Andrew Uzzell Date: Fri, 13 Jan 2023 11:03:56 -0500 Subject: [PATCH 1/3] Enable the Pylint check "consider-using-ternary" --- pandas/core/algorithms.py | 4 +--- pandas/io/stata.py | 4 ++-- pyproject.toml | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index aa9d1c8152019..bf3110fd07db5 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -1196,9 +1196,7 @@ def is_valid_dtype_n_method(dtype: DtypeObj) -> bool: Helper function to determine if dtype is valid for nsmallest/nlargest methods """ - return ( - is_numeric_dtype(dtype) and not is_complex_dtype(dtype) - ) or needs_i8_conversion(dtype) + return is_complex_dtype(dtype) if is_numeric_dtype(dtype) else needs_i8_conversion(dtype) class SelectNSeries(SelectN): diff --git a/pandas/io/stata.py b/pandas/io/stata.py index 18f89754cb672..f4e08b583f1cf 100644 --- a/pandas/io/stata.py +++ b/pandas/io/stata.py @@ -1221,7 +1221,7 @@ def _read_new_header(self) -> None: raise ValueError(_version_error.format(version=self.format_version)) self._set_encoding() self.path_or_buf.read(21) # - self.byteorder = self.path_or_buf.read(3) == b"MSF" and ">" or "<" + self.byteorder = ">" if self.path_or_buf.read(3) == b"MSF" else "<" self.path_or_buf.read(15) # nvar_type = "H" if self.format_version <= 118 else "I" nvar_size = 2 if self.format_version <= 118 else 4 @@ -1413,7 +1413,7 @@ def _read_old_header(self, first_char: bytes) -> None: raise ValueError(_version_error.format(version=self.format_version)) self._set_encoding() self.byteorder = ( - struct.unpack("b", self.path_or_buf.read(1))[0] == 0x1 and ">" or "<" + ">" if struct.unpack("b", self.path_or_buf.read(1))[0] == 0x1 else "<" ) self.filetype = struct.unpack("b", self.path_or_buf.read(1))[0] self.path_or_buf.read(1) # unused diff --git a/pyproject.toml b/pyproject.toml index 0308f86beb0d4..854493d7b417c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -315,7 +315,6 @@ disable = [ "unnecessary-lambda-assignment", # pylint type "R": refactor, for bad code smell - "consider-using-ternary", "consider-using-with", "cyclic-import", "duplicate-code", From 34a0124266fc9b538309390f81af95698da0503d Mon Sep 17 00:00:00 2001 From: Andrew Uzzell Date: Tue, 17 Jan 2023 13:17:56 -0500 Subject: [PATCH 2/3] Reformat file --- pandas/core/algorithms.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index bf3110fd07db5..fdc04d247593a 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -1196,7 +1196,11 @@ def is_valid_dtype_n_method(dtype: DtypeObj) -> bool: Helper function to determine if dtype is valid for nsmallest/nlargest methods """ - return is_complex_dtype(dtype) if is_numeric_dtype(dtype) else needs_i8_conversion(dtype) + return ( + is_complex_dtype(dtype) + if is_numeric_dtype(dtype) + else needs_i8_conversion(dtype) + ) class SelectNSeries(SelectN): From a4e80ffc6f898d5959d3326623dba37b55255b33 Mon Sep 17 00:00:00 2001 From: Andrew Uzzell Date: Mon, 30 Jan 2023 09:13:37 -0500 Subject: [PATCH 3/3] Fix error in ternary statement --- pandas/core/algorithms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index f15a5e91bec84..17abed45f65cc 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -1197,7 +1197,7 @@ def is_valid_dtype_n_method(dtype: DtypeObj) -> bool: nsmallest/nlargest methods """ return ( - is_complex_dtype(dtype) + not is_complex_dtype(dtype) if is_numeric_dtype(dtype) else needs_i8_conversion(dtype) )