Skip to content
Snippets Groups Projects
Commit b749cdc8 authored by Jan David Mol's avatar Jan David Mol
Browse files

L2SS-544: Modernise dict construction using a generator

parent e18710e1
No related branches found
No related tags found
1 merge request!199L2SS-544: Improve LibConfiguration parsing, and return a dict instead of list...
...@@ -373,7 +373,7 @@ class Archiver(): ...@@ -373,7 +373,7 @@ class Archiver():
es = DeviceProxy(es_name) es = DeviceProxy(es_name)
attrs.extend(list(es.AttributeList or [])) attrs.extend(list(es.AttributeList or []))
errs.extend(list(es.AttributeErrorList 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): def get_attribute_errors(self,attribute_name:str):
""" """
...@@ -419,7 +419,7 @@ class Archiver(): ...@@ -419,7 +419,7 @@ class Archiver():
attribute_name = attribute_name_from_url(attribute_name) attribute_name = attribute_name_from_url(attribute_name)
if self.is_attribute_archived(attribute_name): if self.is_attribute_archived(attribute_name):
es = DeviceProxy(self.get_attribute_subscriber(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: for f in freq_dict:
if attribute_name.lower() in f: if attribute_name.lower() in f:
return freq_dict.get(f,0.) return freq_dict.get(f,0.)
...@@ -433,7 +433,7 @@ class Archiver(): ...@@ -433,7 +433,7 @@ class Archiver():
attribute_name = attribute_name_from_url(attribute_name) attribute_name = attribute_name_from_url(attribute_name)
if self.is_attribute_archived(attribute_name): if self.is_attribute_archived(attribute_name):
es = DeviceProxy(self.get_attribute_subscriber(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: for f in fail_dict:
if attribute_name.lower() in f: if attribute_name.lower() in f:
return fail_dict.get(f,0.) return fail_dict.get(f,0.)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment