From 94c3a4407ba106daca2fc24c8c5900562c3a20f8 Mon Sep 17 00:00:00 2001 From: Zhaojuan Guo Date: Mon, 29 Sep 2025 01:56:56 +0000 Subject: [PATCH] Fix linting issues --- pyproject.toml | 1 + src/targetcli/targetclid.py | 2 +- src/targetcli/ui_backstore.py | 4 +--- src/targetcli/ui_root.py | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a79b87a..4900ce7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,6 +96,7 @@ ignore = [ "ARG002", "PLR6301", # TODO Unused self, parameter in methods definitions "PLR09", # Too many branches/statements/arguments "PLW1514", # TODO `open` in text mode without explicit `encoding` argument + "UP031", # Use format specifiers instead of percent format ] [tool.ruff.lint.flake8-quotes] # Single quotes are currently prevalent in the codebase. Not being checked. diff --git a/src/targetcli/targetclid.py b/src/targetcli/targetclid.py index 32c582a..9d303c3 100644 --- a/src/targetcli/targetclid.py +++ b/src/targetcli/targetclid.py @@ -153,7 +153,7 @@ def client_thread(self, connection): connection.close() still_listen = False else: - self.con._stdout = self.con._stderr = f = tempfile.NamedTemporaryFile(mode='w', delete=False) + self.con._stdout = self.con._stderr = f = tempfile.NamedTemporaryFile(mode='w', delete=False) # noqa: SIM115 try: # extract multiple commands delimited with '%' list_data = data.decode().split('%') diff --git a/src/targetcli/ui_backstore.py b/src/targetcli/ui_backstore.py index ef3a54d..3d1e755 100644 --- a/src/targetcli/ui_backstore.py +++ b/src/targetcli/ui_backstore.py @@ -545,9 +545,7 @@ def _ui_block_ro_check(self, dev): return False os.close(f) - if struct.unpack('I', buf)[0] == 0: - return False - return True + return struct.unpack('I', buf)[0] != 0 def ui_command_create(self, name, dev, readonly=None, wwn=None, exclusive=None): diff --git a/src/targetcli/ui_root.py b/src/targetcli/ui_root.py index 4a9b4fb..6b0230c 100644 --- a/src/targetcli/ui_root.py +++ b/src/targetcli/ui_root.py @@ -155,8 +155,7 @@ def _save_backups(self, savefile): prefs = Path(universal_prefs_file).read_text() backups = [line for line in prefs.splitlines() if re.match( r'^max_backup_files\s*=', line)] - if max_backup_files < int(backups[0].split('=')[1].strip()): - max_backup_files = int(backups[0].split('=')[1].strip()) + max_backup_files = max(max_backup_files, int(backups[0].split('=')[1].strip())) except: self.shell.log.debug(f"No universal prefs file '{universal_prefs_file}'.")