DLMS-SPODES 0.86.20__py3-none-any.whl → 0.86.21__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -867,9 +867,7 @@ class Collection:
867
867
 
868
868
  def par2obj(self, par: Parameter) -> result.SimpleOrError[InterfaceClass]:
869
869
  """return: DLMSObject"""
870
- if obj := self.__objs.get(par.obis):
871
- return result.Simple(obj)
872
- return result.Error.from_e(exc.NoObject(f"with {par=}"), "get object")
870
+ return self.obis2obj(par.obis)
873
871
 
874
872
  def par2data(self, par: Parameter) -> result.Option[cdt.CommonDataType] | result.Error:
875
873
  """:return CDT by Parameter, return None if data wasn't setting"""
@@ -1228,10 +1226,9 @@ class Collection:
1228
1226
  return obj
1229
1227
 
1230
1228
  def obis2obj(self, obis: o.OBIS) -> result.SimpleOrError[InterfaceClass]:
1231
- res = self.__objs.get(obis)
1232
- if res.value is None:
1229
+ if obj := self.__objs.get(obis):
1233
1230
  return result.Error.from_e(exc.NoObject(obis))
1234
- return result.Simple(res.value)
1231
+ return result.Simple(obj)
1235
1232
 
1236
1233
  def logicalName2obj(self, ln: cst.LogicalName) -> result.SimpleOrError[InterfaceClass]:
1237
1234
  return self.obis2obj(o.OBIS(ln.contents))
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: DLMS_SPODES
3
- Version: 0.86.20
3
+ Version: 0.86.21
4
4
  Summary: dlms-spodes
5
5
  Author-email: Serj Kotilevski <youserj@outlook.com>
6
6
  Project-URL: Source, https://github.com/youserj/DlmsSPODES-project
@@ -25,7 +25,7 @@ DLMS_SPODES/cosem_interface_classes/activity_calendar.py,sha256=VWSiKn2LNBA1VLAA
25
25
  DLMS_SPODES/cosem_interface_classes/arbitrator.py,sha256=S9TguoMG6O5DpMBp6mpcJpw6PHanvh4SEAN3M_v6qts,3240
26
26
  DLMS_SPODES/cosem_interface_classes/attr_indexes.py,sha256=aUSnT-dKoBsDbwLhlgtLIHGRl7PZrT-ld2ThCEUjUeA,328
27
27
  DLMS_SPODES/cosem_interface_classes/clock.py,sha256=9OJwRGrbFPws_VZPayHv-hzFJegIcjgoJoenIqofd5w,4525
28
- DLMS_SPODES/cosem_interface_classes/collection.py,sha256=XkxulEE3OQru6taM732_UNOXuCpy8UZKYqhZV_Wco2A,96415
28
+ DLMS_SPODES/cosem_interface_classes/collection.py,sha256=kvT_bRn134OWpfgYkitiG98nx2mjmlPithUqvHjlYBA,96258
29
29
  DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py,sha256=LUtooNc45Fvk2d7oIPRT41zJDQnyo5Y3S5T-90WV7QE,23506
30
30
  DLMS_SPODES/cosem_interface_classes/data.py,sha256=YSjA3Y0M5NMcfYzWPEuZw6ojIqr2UghgW_ck8dXySMU,809
31
31
  DLMS_SPODES/cosem_interface_classes/disconnect_control.py,sha256=CIx7I4QRpPxAC5iYxpbhCIuv6U2P3s6ELam8eD-kD5w,2926
@@ -112,7 +112,7 @@ DLMS_SPODES/types/implementations/integers.py,sha256=KAcaTY8ZwhBaJThbLSr39Oh_-9h
112
112
  DLMS_SPODES/types/implementations/long_unsigneds.py,sha256=SxmFvD2moQ03p-KZSBYK1Rv7bQSaywlHVXBfkTZG1OQ,8761
113
113
  DLMS_SPODES/types/implementations/octet_string.py,sha256=Jo_sfWcsfstiP4O6mXfBOOQlksx1c2qJMI-vbAOV-yM,294
114
114
  DLMS_SPODES/types/implementations/structs.py,sha256=GMOo6Jy8jA9d6KTLs0D-j5t0oSRvxUIwtBr_4UePwbA,2059
115
- dlms_spodes-0.86.20.dist-info/METADATA,sha256=HeWihdUI3p-KXWOeiuLay9LvQGoSsl0MAJr6E7YJ1sw,1028
116
- dlms_spodes-0.86.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
117
- dlms_spodes-0.86.20.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
118
- dlms_spodes-0.86.20.dist-info/RECORD,,
115
+ dlms_spodes-0.86.21.dist-info/METADATA,sha256=WDKahOpl6Y545DitGKIQecn58woKS4tyd2JFmwhIM6c,1028
116
+ dlms_spodes-0.86.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
117
+ dlms_spodes-0.86.21.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
118
+ dlms_spodes-0.86.21.dist-info/RECORD,,