From fe7c7db0040e90aa0cf534335abc4925e45f2b21 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Wed, 9 Jul 2025 15:06:27 +0900 Subject: [PATCH] Change all __class__ to self for class global var --- src/corelibs/logging_handling/log.py | 17 ++++++++--------- .../string_handling/timestamp_strings.py | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/corelibs/logging_handling/log.py b/src/corelibs/logging_handling/log.py index b5a10ab..d4052f1 100644 --- a/src/corelibs/logging_handling/log.py +++ b/src/corelibs/logging_handling/log.py @@ -43,7 +43,6 @@ class CustomConsoleFormatter(logging.Formatter): "ERROR": Colors.red, "CRITICAL": Colors.magenta, "EXCEPTION": Colors.magenta_bold, - "RESET": Colors.reset, # Reset } def format(self, record: logging.LogRecord) -> str: @@ -57,7 +56,7 @@ class CustomConsoleFormatter(logging.Formatter): str -- _description_ """ # Add color to levelname for console output - reset = self.COLORS["RESET"] + reset = Colors.reset color = self.COLORS.get(record.levelname, reset) # only highlight level for basic if record.levelname in ['DEBUG', 'INFO']: @@ -154,17 +153,17 @@ class Log: ) -> LogSettings: # skip with defaul it not set if log_settings is None: - return __class__.DEFAULT_LOG_SETTINGS + return self.DEFAULT_LOG_SETTINGS # check entries - default_log_settings = __class__.DEFAULT_LOG_SETTINGS + default_log_settings = self.DEFAULT_LOG_SETTINGS # check log levels for __log_entry in ['log_level_console', 'log_level_file']: if log_settings.get(__log_entry) is None: continue # if not valid reset to default, if not in default set to WARNING if not self.validate_log_level(_log_level := log_settings.get(__log_entry, '')): - _log_level = __class__.DEFAULT_LOG_SETTINGS.get( - __log_entry, __class__.DEFAULT_LOG_LEVEL + _log_level = self.DEFAULT_LOG_SETTINGS.get( + __log_entry, self.DEFAULT_LOG_LEVEL ) default_log_settings[__log_entry] = str(_log_level) # check bool @@ -177,10 +176,10 @@ class Log: if log_settings.get(__log_entry) is None: continue if not isinstance(__setting := log_settings.get(__log_entry, ''), bool): - __setting = __class__.DEFAULT_LOG_SETTINGS.get(__log_entry, True) + __setting = self.DEFAULT_LOG_SETTINGS.get(__log_entry, True) default_log_settings[__log_entry] = __setting # check log queue - __setting = log_settings.get('log_queue', __class__.DEFAULT_LOG_SETTINGS['log_queue']) + __setting = log_settings.get('log_queue', self.DEFAULT_LOG_SETTINGS['log_queue']) if __setting is not None: __setting = cast('Queue[str]', __setting) default_log_settings['log_queue'] = __setting @@ -308,7 +307,7 @@ class Log: Keyword Arguments: info {str} -- _description_ (default: {"BREAK"}) """ - self.logger.info("[%s] %s>", info, __class__.SPACER_CHAR * __class__.SPACER_LENGTH) + self.logger.info("[%s] %s>", info, self.SPACER_CHAR * self.SPACER_LENGTH) def exception(self, msg: object, *args: object, extra: Mapping[str, object] | None = None) -> None: """ diff --git a/src/corelibs/string_handling/timestamp_strings.py b/src/corelibs/string_handling/timestamp_strings.py index 8ffd319..b0581c7 100644 --- a/src/corelibs/string_handling/timestamp_strings.py +++ b/src/corelibs/string_handling/timestamp_strings.py @@ -15,7 +15,7 @@ class TimestampStrings: def __init__(self, time_zone: str | None = None): self.timestamp_now = datetime.now() - self.time_zone = time_zone if time_zone is not None else __class__.time_zone + self.time_zone = time_zone if time_zone is not None else self.time_zone try: self.timestamp_now_tz = datetime.now(ZoneInfo(self.time_zone)) except ZoneInfoNotFoundError as e: