From 34e0982f39adb10bb91113465db8d8cda3f0f1ba Mon Sep 17 00:00:00 2001
From: jkerdreux-imt <jerome.kerdreux@imt-atlantique.fr>
Date: Sun, 24 Nov 2024 01:44:14 +0100
Subject: [PATCH] Formating, fix ruff errors
---
libs/monitor/xaal/monitor/monitor.py | 43 ++++++++++++++--------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/libs/monitor/xaal/monitor/monitor.py b/libs/monitor/xaal/monitor/monitor.py
index c685169d..0c27fadb 100644
--- a/libs/monitor/xaal/monitor/monitor.py
+++ b/libs/monitor/xaal/monitor/monitor.py
@@ -34,7 +34,7 @@ class TimedDict(dict):
super().__setitem__(key,item)
self.updated()
- def update(self,dict_):
+ def update(self, dict_):
changed = False if self.last_update !=0 else True
if dict_!= self:
changed = True
@@ -78,7 +78,7 @@ class Device:
def set_db(self,data):
purge = []
for k in data:
- if data[k]==None:
+ if data[k] is None:
purge.append(k)
r = self.db.update(data)
for k in purge:
@@ -87,7 +87,6 @@ class Device:
def is_ready(self):
if self.attributes.is_ready() and self.description.is_ready() and self.db.is_ready():
- #if self.description.is_ready():
return True
return False
@@ -148,7 +147,7 @@ class Devices:
r.append(d)
return r
- def get_with_dev_type(self,dev_type):
+ def get_with_dev_type(self, dev_type):
r = []
for d in self.get():
if d.dev_type == dev_type:
@@ -162,15 +161,15 @@ class Devices:
r.append(d)
return r
- def get_with_key_value(self,key,value):
+ def get_with_key_value(self, key, value):
r = []
for d in self.get():
if (key in d.db) and (d.db[key]==value):
r.append(d)
return r
- def fetch_one_kv(self,key,value):
- r = self.get_with_key_value(key,value)
+ def fetch_one_kv(self, key, value):
+ r = self.get_with_key_value(key, value)
try:
return r[0]
except IndexError:
@@ -188,7 +187,7 @@ class Devices:
def __len__(self):
return len(self.__devs)
- def __getitem__(self,idx):
+ def __getitem__(self, idx):
if isinstance(idx, str):
return self.__devs[idx]
return self.get()[idx]
@@ -196,7 +195,7 @@ class Devices:
def __repr__(self):
return str(self.get())
- def __contains__(self,key):
+ def __contains__(self, key):
return key in self.__devs
def auto_wash(self):
@@ -249,7 +248,7 @@ class Monitor:
def on_receive_msg(self, msg: Message):
# do nothing for some msg
- if (self.filter!=None) and self.filter(msg)==False:
+ if (self.filter is not None) and not self.filter(msg):
return
if msg.source not in self.devices:
dev = self.add_device(msg)
@@ -283,18 +282,18 @@ class Monitor:
if changed:
self.notify(Notification.metadata_change,target)
- def subscribe(self,func):
+ def subscribe(self, func):
self.subscribers.append(func)
- def unsubscribe(self,func):
+ def unsubscribe(self, func):
self.subscribers.remove(func)
- def notify(self,ev_type,device):
+ def notify(self, ev_type, device):
for s in self.subscribers:
#logger.warning(f"{s} {ev_type}")
s(ev_type,device)
- def add_device(self,msg):
+ def add_device(self, msg):
return self.devices.add(msg.source,msg.dev_type)
def auto_wash(self):
@@ -337,34 +336,34 @@ class Monitor:
if cnt > 40:
break
# switch to normal timer after boot
- if self.boot_finished == False and cnt == 0 and len(self.devices)!=0:
+ if not self.boot_finished and cnt == 0 and len(self.devices)!=0:
self.refresh_timer.period = REFRESH_TIMER
logger.debug("Switching to slow refresh timer")
self.boot_finished = True
elif cnt!=0:
logger.debug("request queued: %d" % cnt )
- def request_metadb(self,addr):
+ def request_metadb(self, addr):
if self.db_server:
- self.engine.send_request(self.dev,[self.db_server,],'get_keys_values',{'device':addr})
+ self.engine.send_request(self.dev, [self.db_server,], 'get_keys_values', {'device':addr})
- def request_attributes(self,addr):
+ def request_attributes(self, addr):
self.engine.send_get_attributes(self.dev,[addr,])
- def request_description(self,addr):
+ def request_description(self, addr):
self.engine.send_get_description(self.dev,[addr,])
- def is_from_metadb(self,msg):
+ def is_from_metadb(self, msg):
if (msg.is_notify() or msg.is_reply()) and msg.source == self.db_server :
return True
return False
- def is_reply_metadb(self,msg):
+ def is_reply_metadb(self, msg):
if msg.is_reply() and msg.action == 'get_keys_values' and msg.source == self.db_server:
return True
return False
- def is_update_metadb(self,msg):
+ def is_update_metadb(self, msg):
if msg.is_notify() and msg.action == 'keys_values_changed' and msg.source == self.db_server:
return True
return False
--
GitLab