From 26f79829dd421f496d4ee381b7e85d2c027e65d9 Mon Sep 17 00:00:00 2001 From: Nicholas Felt Date: Thu, 16 Jan 2025 12:13:01 -0800 Subject: [PATCH] refactor: Update a few error messages to indicate the method they occurred in --- src/tm_devices/driver_mixins/device_control/pi_control.py | 6 ++++-- src/tm_devices/helpers/logging.py | 2 -- tests/test_logging.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tm_devices/driver_mixins/device_control/pi_control.py b/src/tm_devices/driver_mixins/device_control/pi_control.py index 2d78ce0f..c5ce6bb1 100644 --- a/src/tm_devices/driver_mixins/device_control/pi_control.py +++ b/src/tm_devices/driver_mixins/device_control/pi_control.py @@ -418,7 +418,7 @@ def query_binary(self, query: str, verbose: bool = True) -> Sequence[float]: if not response: pi_cmd_repr = ( - f" for the following query: {query!r}" if self._verbose and verbose else "" + f" for the following binary query: {query!r}" if self._verbose and verbose else "" ) msg = f"An empty string was returned from {self._name_and_alias}{pi_cmd_repr}" _logger.error(msg) @@ -553,7 +553,9 @@ def query_raw_binary(self, query: str, verbose: bool = True) -> bytes: if not response.strip(): pi_cmd_repr = ( - f" for the following query: {query!r}" if self._verbose and verbose else "" + f" for the following raw binary query: {query!r}" + if self._verbose and verbose + else "" ) msg = f"An empty string was returned from {self._name_and_alias}{pi_cmd_repr}" _logger.error(msg) diff --git a/src/tm_devices/helpers/logging.py b/src/tm_devices/helpers/logging.py index 6b3842dd..fe7bd402 100644 --- a/src/tm_devices/helpers/logging.py +++ b/src/tm_devices/helpers/logging.py @@ -180,8 +180,6 @@ def configure_logging( # pylint: disable=too-many-locals if log_uncaught_exceptions and log_file_level != LoggingLevels.NONE: sys.excepthook = __exception_handler - else: - sys.excepthook = sys.__excepthook__ _logger_initialized = True return _logger diff --git a/tests/test_logging.py b/tests/test_logging.py index 27e9d998..96a94945 100644 --- a/tests/test_logging.py +++ b/tests/test_logging.py @@ -85,6 +85,7 @@ def test_configure_logger_full(reset_package_logger: None) -> None: # noqa: ARG assert not any(isinstance(handler, logging.FileHandler) for handler in pyvisa.logger.handlers) assert len(logging.getLogger(PACKAGE_NAME).handlers) == 0 # pylint: disable=use-implicit-booleaness-not-comparison-to-zero + sys.excepthook = sys.__excepthook__ logger = configure_logging( log_console_level="DEBUG", log_file_level="DEBUG",