Skip to content

Commit e00a4ec

Browse files
committed
ucloud: minor code improvements.
1 parent 464d457 commit e00a4ec

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

aiotcloud/ucloud.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,30 +65,27 @@ def __repr__(self):
6565
return f"{self.value}"
6666

6767
def __contains__(self, key):
68-
if isinstance(self.value, dict):
69-
return key in self._value
70-
return False
71-
72-
@property
73-
def initialized(self):
74-
if isinstance(self.value, dict):
75-
for r in self.value.values():
76-
if not r.initialized: return False
77-
return self.value is not None
68+
return isinstance(self.value, dict) and key in self._value
7869

7970
@property
8071
def updated(self):
8172
if isinstance(self.value, dict):
82-
for r in self.value.values():
83-
if r._updated: return True
73+
return any(r._updated for r in self.value.values())
8474
return self._updated
8575

8676
@updated.setter
8777
def updated(self, value):
8878
if isinstance(self.value, dict):
89-
for r in self.value.values(): r._updated = value
79+
for r in self.value.values():
80+
r._updated = value
9081
self._updated = value
9182

83+
@property
84+
def initialized(self):
85+
if isinstance(self.value, dict):
86+
return all(r.initialized for r in self.value.values())
87+
return self.value is not None
88+
9289
@SenmlRecord.value.setter
9390
def value(self, value):
9491
if value is not None:
@@ -127,7 +124,7 @@ def add_to_pack(self, pack):
127124
if isinstance(self.value, dict):
128125
for r in self.value.values():
129126
# NOTE: should filter by updated when it's supported.
130-
if r.value is not None:
127+
if r.value is not None: # and r.updated
131128
pack.add(r)
132129
else:
133130
pack.add(self)

0 commit comments

Comments
 (0)