senml: Use the updated cbor2 API.

iabdalkader · dpgeorge · commit 661efa48f091 · 2024-03-19T17:29:22.000+11:00
Signed-off-by: iabdalkader &lt;i.abdalkader@gmail.com&gt;
diff --git a/micropython/senml/examples/basic_cbor.py b/micropython/senml/examples/basic_cbor.py
@@ -26,7 +26,7 @@
 
 from senml import *
 import time
-from cbor2 import decoder
+import cbor2
 
 pack = SenmlPack("device_name")
 
@@ -38,5 +38,5 @@
         cbor_val = pack.to_cbor()
         print(cbor_val)
         print(cbor_val.hex())
-        print(decoder.loads(cbor_val))  # convert to string again so we can print it.
+        print(cbor2.loads(cbor_val))  # convert to string again so we can print it.
     time.sleep(1)
diff --git a/micropython/senml/manifest.py b/micropython/senml/manifest.py
@@ -1,6 +1,6 @@
 metadata(
     description="SenML serialisation for MicroPython.",
-    version="0.1.0",
+    version="0.1.1",
     pypi_publish="micropython-senml",
 )
 
diff --git a/micropython/senml/senml/senml_pack.py b/micropython/senml/senml/senml_pack.py
@@ -27,8 +27,7 @@
 from senml.senml_record import SenmlRecord
 from senml.senml_base import SenmlBase
 import json
-from cbor2 import encoder
-from cbor2 import decoder
+import cbor2
 
 
 class SenmlPackIterator:
@@ -278,7 +277,7 @@ def from_cbor(self, data):
         :param data: a byte array.
         :return: None
         """
-        records = decoder.loads(data)  # load the raw senml data
+        records = cbor2.loads(data)  # load the raw senml data
         naming_map = {
             "bn": -2,
             "bt": -3,
@@ -320,7 +319,7 @@ def to_cbor(self):
         }
         converted = []
         self._build_rec_dict(naming_map, converted)
-        return encoder.dumps(converted)
+        return cbor2.dumps(converted)
 
     def add(self, item):
         """

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`metadata(`
`2`	`2`	`description="SenML serialisation for MicroPython.",`
`3`		`- version="0.1.0",`
	`3`	`+ version="0.1.1",`
`4`	`4`	`pypi_publish="micropython-senml",`
`5`	`5`	`)`
`6`	`6`