From b749cdc8710779731a6d663c880dac203e0eeb5f Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 17 Dec 2021 14:26:52 +0100
Subject: [PATCH] L2SS-544: Modernise dict construction using a generator
---
tangostationcontrol/tangostationcontrol/toolkit/archiver.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tangostationcontrol/tangostationcontrol/toolkit/archiver.py b/tangostationcontrol/tangostationcontrol/toolkit/archiver.py
index f68e29194..cea9a016a 100644
--- a/tangostationcontrol/tangostationcontrol/toolkit/archiver.py
+++ b/tangostationcontrol/tangostationcontrol/toolkit/archiver.py
@@ -373,7 +373,7 @@ class Archiver():
es = DeviceProxy(es_name)
attrs.extend(list(es.AttributeList or []))
errs.extend(list(es.AttributeErrorList or []))
- return dict((a,e) for a,e in zip(attrs,errs) if e) or {}
+ return {a: e for a,e in zip(attrs,errs) if e}
def get_attribute_errors(self,attribute_name:str):
"""
@@ -419,7 +419,7 @@ class Archiver():
attribute_name = attribute_name_from_url(attribute_name)
if self.is_attribute_archived(attribute_name):
es = DeviceProxy(self.get_attribute_subscriber(attribute_name))
- freq_dict = dict((a,r) for a,r in zip(es.AttributeList,es.AttributeRecordFreqList))
+ freq_dict = {a: r for a,r in zip(es.AttributeList,es.AttributeRecordFreqList)}
for f in freq_dict:
if attribute_name.lower() in f:
return freq_dict.get(f,0.)
@@ -433,7 +433,7 @@ class Archiver():
attribute_name = attribute_name_from_url(attribute_name)
if self.is_attribute_archived(attribute_name):
es = DeviceProxy(self.get_attribute_subscriber(attribute_name))
- fail_dict = dict((a,r) for a,r in zip(es.AttributeList,es.AttributeFailureFreqList))
+ fail_dict = {a: r for a,r in zip(es.AttributeList,es.AttributeFailureFreqList)}
for f in fail_dict:
if attribute_name.lower() in f:
return fail_dict.get(f,0.)
--
GitLab