From 4fdd6c6cdccf753d74b949dd3aeeb147c9a40d65 Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Sun, 25 May 2025 12:00:22 +0200 Subject: [PATCH] scripts: logging: dictionary: log_database: Fix linter issues Fix issues reported by ruff. Signed-off-by: Pieter De Gendt --- .ruff-excludes.toml | 6 ------ .../dictionary/dictionary_parser/log_database.py | 13 ++++--------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.ruff-excludes.toml b/.ruff-excludes.toml index a339ae480c8..179b463c8d8 100644 --- a/.ruff-excludes.toml +++ b/.ruff-excludes.toml @@ -568,12 +568,6 @@ "UP036", # https://docs.astral.sh/ruff/rules/outdated-version-block "UP038", # https://docs.astral.sh/ruff/rules/non-pep604-isinstance ] -"./scripts/logging/dictionary/dictionary_parser/log_database.py" = [ - "I001", # https://docs.astral.sh/ruff/rules/unsorted-imports - "SIM103", # https://docs.astral.sh/ruff/rules/needless-bool - "UP015", # https://docs.astral.sh/ruff/rules/redundant-open-modes - "UP039", # https://docs.astral.sh/ruff/rules/unnecessary-class-parentheses -] "./scripts/logging/dictionary/dictionary_parser/log_parser.py" = [ "I001", # https://docs.astral.sh/ruff/rules/unsorted-imports ] diff --git a/scripts/logging/dictionary/dictionary_parser/log_database.py b/scripts/logging/dictionary/dictionary_parser/log_database.py index fb66be08894..a3fd378a325 100644 --- a/scripts/logging/dictionary/dictionary_parser/log_database.py +++ b/scripts/logging/dictionary/dictionary_parser/log_database.py @@ -13,9 +13,7 @@ import copy import json from .mipi_syst import gen_syst_xml_file -from .utils import extract_one_string_in_section -from .utils import find_string_in_mappings - +from .utils import extract_one_string_in_section, find_string_in_mappings ARCHS = { "arc" : { @@ -51,7 +49,7 @@ ARCHS = { } -class LogDatabase(): +class LogDatabase: """Class of log database""" # Update this if database format of dictionary based logging # has changed @@ -168,10 +166,7 @@ class LogDatabase(): def has_string_mappings(self): """Return True if there are string mappings in database""" - if 'string_mappings' in self.database: - return True - - return False + return 'string_mappings' in self.database def has_string_sections(self): @@ -253,7 +248,7 @@ class LogDatabase(): def read_json_database(db_file_name): """Read database from file and return a LogDatabase object""" try: - with open(db_file_name, "r", encoding="iso-8859-1") as db_fd: + with open(db_file_name, encoding="iso-8859-1") as db_fd: json_db = json.load(db_fd) except (OSError, json.JSONDecodeError): return None