From 67ee373562ea13c6173f5b8c98759b955bcbd0a7 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sun, 30 Apr 2023 21:12:26 +0200
Subject: [PATCH] Fixes deprecation
---
logging_setup.py | 2 +-
ohmpi.py | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/logging_setup.py b/logging_setup.py
index 01c40273..724b85ab 100644
--- a/logging_setup.py
+++ b/logging_setup.py
@@ -145,7 +145,7 @@ def setup_loggers(mqtt=True):
if mqtt:
mqtt_settings = MQTT_LOGGING_CONFIG.copy()
mqtt_data_logging_level = mqtt_settings.pop('data_logging_level', logging.INFO)
- [mqtt_settings.pop(i) for i in ['client_id', 'exec_topic', 'data_topic', 'soh_topic', 'exec_logging_level',
+ [mqtt_settings.pop(i, None) for i in ['client_id', 'exec_topic', 'data_topic', 'soh_topic', 'exec_logging_level',
'soh_logging_level']]
mqtt_settings.update({'topic': MQTT_LOGGING_CONFIG['data_topic']})
try:
diff --git a/ohmpi.py b/ohmpi.py
index b9fbf639..a727fc00 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -154,10 +154,8 @@ class OhmPi(object):
' Use python/ipython to interact with OhmPi object...')
def __getattr__(self, name):
- if hasattr(deprecated, name):
+ if not hasattr(self, name) and hasattr(deprecated, name):
return getattr(deprecated, name)
- else:
- return self.__getattr__(name)
@staticmethod
def append_and_save(filename: str, last_measurement: dict, cmd_id=None):
--
GitLab