xaal.lib 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

xaal/lib/cbor.py

@@ -1,13 +1,12 @@
 from io import BytesIO
 import cbor2
 from cbor2 import CBORTag
-from cbor2 import CBORDecoder
-# from cbor2.decoder import CBORDecoder
+from cbor2.decoder import CBORDecoder
 
 from . import bindings
 
 # ugly patch to remove default UUID decodeur
-cbor2._decoder.semantic_decoders.pop(37)
+cbor2.decoder.semantic_decoders.pop(37)
 
 
 def tag_hook(decoder, tag, shareable_index=None):
@@ -17,11 +16,6 @@ def tag_hook(decoder, tag, shareable_index=None):
         return bindings.URL(tag.value)
     return tag
 
-def object_hook(decoder, data):
-    #print("hook [%s]" % data)
-    return data
-
-
 def default_encoder(encoder, value):
     if isinstance(value,bindings.UUID):
         encoder.encode(CBORTag(37, value.bytes))
@@ -34,7 +28,7 @@ def dumps(obj, **kwargs):
 
 def loads(payload, **kwargs):
     #return cbor2.loads(payload,tag_hook=tag_hook,**kwargs)
-    return _loads(payload,tag_hook=tag_hook,object_hook=object_hook,**kwargs)
+    return _loads(payload,tag_hook=tag_hook,**kwargs)
 
 def _loads(s, **kwargs):
     with BytesIO(s) as fp:
@@ -44,16 +38,16 @@ def _loads(s, **kwargs):
 
 
 def cleanup(obj):
-    """ 
+    """
     recursive walk a object to search for un-wanted CBOR tags.
     Transform this tag in string format, this can be UUID, URL..
-    Should be Ok, with list, dicts.. 
-    Warning: This operate in-place changes. 
+    Should be Ok, with list, dicts..
+    Warning: This operate in-place changes.
     Warning: This won't work for tags in dict keys.
     """
     if isinstance(obj,list):
         for i in range(0,len(obj)):
-            obj[i] = cleanup(obj[i]) 
+            obj[i] = cleanup(obj[i])
         return obj
 
     if isinstance(obj,dict):

xaal/lib/messages.py

@@ -210,7 +210,7 @@ class MessageFactory(object):
 class MessageType(Enum):
     NOTIFY  = 0
     REQUEST = 1
-    REPLY   = 2 
+    REPLY   = 2
 
 
 class MessageAction(Enum):
@@ -323,8 +323,8 @@ def build_nonce(data):
 
 def build_timestamp():
     """Return array [seconds since epoch, microseconds since last seconds] Time = UTC+0000"""
-    epoch = datetime.datetime.utcfromtimestamp(0)
-    timestamp = datetime.datetime.utcnow() - epoch
+    epoch = datetime.datetime.fromtimestamp(0, datetime.UTC)
+    timestamp = datetime.datetime.now(datetime.UTC) - epoch
     return _packtimestamp(timestamp.total_seconds(), timestamp.microseconds)
 
 

{xaal.lib-0.7.3.dist-info → xaal.lib-0.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xaal.lib
-Version: 0.7.3
+Version: 0.7.5
 Summary: Official Python stack for xAAL protocol
 Author-email: Jerome Kerdreux <Jerome.Kerdreux@imt-atlantique.fr>
 License: GPL License

{xaal.lib-0.7.3.dist-info → xaal.lib-0.7.5.dist-info}/RECORD

@@ -5,18 +5,18 @@ xaal/lib/aioengine.py,sha256=3MTG9aGKekVvsWhYaehZqZem6YmPng4UqGfDoRTaC2E,13100
 xaal/lib/aiohelpers.py,sha256=2a310wSXzbg9SGYzrTfcHbaZ8PWEe9rLteDmS2i62kU,1007
 xaal/lib/aionetwork.py,sha256=pH-5kf8o4FHsbvs-oFf5guAgYaEu0aosyTuI3k8xt2M,2484
 xaal/lib/bindings.py,sha256=EkDJJ_iBQbC7UzsjHfoXAjpGSwC613hrIm5ubrkcw4k,1994
-xaal/lib/cbor.py,sha256=2t9ndDLd1vdW3NJk9itE0vmIXWShj3FFiKVNoXSCAio,1772
+xaal/lib/cbor.py,sha256=yOTAo3TBO7m8KU_ffccJdOZmiJF5tfY7H8nC1XfMIS8,1630
 xaal/lib/config.py,sha256=jNAEXCswWsKrVab3hycupQn4aYt4c61eq628ow_I2ZI,1736
 xaal/lib/core.py,sha256=VfaisNREUse-zMrilJuKf6NLVO9HugL1U_I4M7BFzKQ,10806
 xaal/lib/devices.py,sha256=ZDNVNVmJ26W2atuNkzB7xtYZQAT3dWTrQCvMCDMSVWA,9574
 xaal/lib/engine.py,sha256=p2of6IPQB0It0RNu5fkJHHp615K_2rgzHfuWOpvJ6Is,7539
 xaal/lib/exceptions.py,sha256=ZKDKGlm_F48K_0NlaV1fa0Z-a4ZnOxT7NU8c8MKSJAc,504
 xaal/lib/helpers.py,sha256=mXxVxv7fTV9O9xO1BROhVYBTmdviMl6qx3Il8q1ox8w,2679
-xaal/lib/messages.py,sha256=cLwplLp_0qmlgZi6ByohvLEcmuxpWK7liE5dpqyV9AM,11552
+xaal/lib/messages.py,sha256=W7RdHOtX_DT0bCeJAzs0p4KkU5KXofZUCMQYQsOuFF8,11571
 xaal/lib/network.py,sha256=3HWuQ0afQ-X6_-En2rFeqYJ0Scy5IEHfd0qTldxxCFo,3130
 xaal/lib/test.py,sha256=laVbgG4HtQquxDzixAG-Cka-HO4kpb7YUsLL267mGPU,3006
 xaal/lib/tools.py,sha256=SnXmOkeTd4eTN8yWn-GyCkV5mYiG-MX4hkF39KnogLE,3841
-xaal.lib-0.7.3.dist-info/METADATA,sha256=ALJzra6dw0iAj569z5Dj_tXD96a0o8z7F3y3IPMhNc8,3809
-xaal.lib-0.7.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-xaal.lib-0.7.3.dist-info/top_level.txt,sha256=UZ2WDkN02ztkh1OrsjrW8Kmj4n3WqC0BQxaEYOYfWa0,5
-xaal.lib-0.7.3.dist-info/RECORD,,
+xaal.lib-0.7.5.dist-info/METADATA,sha256=Rgz65jLN7oCAKVY6YPcMNDdal4Dnz4dTGiy2epRMWkE,3809
+xaal.lib-0.7.5.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+xaal.lib-0.7.5.dist-info/top_level.txt,sha256=UZ2WDkN02ztkh1OrsjrW8Kmj4n3WqC0BQxaEYOYfWa0,5
+xaal.lib-0.7.5.dist-info/RECORD,,