xaal.lib 0.7.3__tar.gz → 0.7.5__tar.gz

{xaal_lib-0.7.3 → xaal_lib-0.7.5}/PKG-INFO

@@ -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 → xaal_lib-0.7.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xaal.lib"
-version = "0.7.3"
+version = "0.7.5"
 description = "Official Python stack for xAAL protocol"
 readme = "README.rst"
 authors = [

{xaal_lib-0.7.3 → xaal_lib-0.7.5}/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-0.7.3 → xaal_lib-0.7.5}/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 → xaal_lib-0.7.5}/xaal.lib.egg-info/PKG-INFO

@@ -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