Move codecs from network to messages

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/trunk@2004 b32b6428-25c9-4566-ad07-03861ab6144f

libs/lib/xaal/lib/devices.py

@@ -152,6 +152,11 @@ class Device(object):
         if attr:
             self.__attributes.append(attr)
             attr.device = self
+    
+    def del_attribute(self,attr):
+        if attr:
+            attr.device = None
+            self.__attributes.remove(attr)
 
     def get_attribute(self,name):
         for attr in self.__attributes:

libs/lib/xaal/lib/messages.py

@@ -33,6 +33,7 @@ import pysodium
 import base64
 import struct
 import sys
+import codecs
 
 import logging
 logger = logging.getLogger(__name__)
@@ -78,7 +79,8 @@ class MessageFactory(object):
         result['payload'] = base64.b64encode(ciph)
 
         # Json serialization
-        return json.dumps(result)
+        message = json.dumps(result)
+        return codecs.encode(message)
 
     def decode_msg(self, data):
         """Decode incoming Json data and De-Ciphering
@@ -96,9 +98,10 @@ class MessageFactory(object):
         # Instanciate Message
         msg = Message()
         try:
-            msg.targets = json.loads(data_rx['targets'])
-            msg.version = data_rx['version']
-            msg_time    = data_rx['timestamp'][0]
+            msg.targets   = json.loads(data_rx['targets'])
+            msg.version   = data_rx['version']
+            msg.timestamp = data_rx['timestamp']
+            msg_time      = data_rx['timestamp'][0]
         except (KeyError, IndexError):
             raise MessageParserError("Bad Message, wrong fields")
 

libs/lib/xaal/lib/network.py

@@ -93,10 +93,7 @@ class NetworkConnector(object):
         except Exception as e:
             self.network_error(e)
 
-    def send(self, message):
-        self.send_raw(codecs.encode(message))
-
-    def send_raw(self,data):
+    def send(self,data):
         if not self.is_connected(): self.connect()
         try:
             self.__sock.sendto(data, (self.addr, self.port))