packets: fix the string encoding and decoding in some packets

Signed-off-by: Diego Escalona <diego.escalona@digi.com>

Author: diescalo

digi/xbee/packets/common.py

@@ -96,7 +96,7 @@ def create_packet(raw, operating_mode):
         if raw[3] != ApiFrameType.AT_COMMAND.code:
             raise InvalidPacketException("This packet is not an AT command packet.")
 
-        return ATCommPacket(raw[4], str(raw[5:7]), raw[7:-1])
+        return ATCommPacket(raw[4], raw[5:7].decode("utf8"), raw[7:-1])
 
     def needs_id(self):
         """
@@ -115,8 +115,8 @@ def _get_api_packet_spec_data(self):
            | :meth:`.XBeeAPIPacket._get_api_packet_spec_data`
         """
         if self.__parameter is not None:
-            return bytearray(self.__command, 'utf8') + self.__parameter
-        return bytearray(self.__command, 'utf8')
+            return bytearray(self.__command, "utf8") + self.__parameter
+        return bytearray(self.__command, "utf8")
 
     def _get_api_packet_spec_data_dict(self):
         """
@@ -259,7 +259,7 @@ def create_packet(raw, operating_mode):
         if ATCommandStatus.get(raw[7]) is None:
             raise InvalidPacketException("Invalid command status.")
 
-        return ATCommResponsePacket(raw[4], raw[5:7].decode(), ATCommandStatus.get(raw[7]), raw[8:-1])
+        return ATCommResponsePacket(raw[4], raw[5:7].decode("utf8"), ATCommandStatus.get(raw[7]), raw[8:-1])
 
     def needs_id(self):
         """
@@ -277,7 +277,7 @@ def _get_api_packet_spec_data(self):
         .. seealso::
            | :meth:`.XBeeAPIPacket._get_api_packet_spec_data`
         """
-        ret = bytearray(self.__command)
+        ret = bytearray(self.__command, "utf8")
         ret.append(self.__response_status.code)
         if self.__comm_value is not None:
             ret += self.__comm_value
@@ -680,10 +680,10 @@ def create_packet(raw, operating_mode):
 
         return RemoteATCommandPacket(
                 raw[4],
-                XBee64BitAddress(raw[5:12]),
+                XBee64BitAddress(raw[5:13]),
                 XBee16BitAddress(raw[13:15]),
                 raw[15],
-                str(raw[16:18]),
+                raw[16:18].decode("utf8"),
                 raw[18:-1]
         )
 
@@ -706,7 +706,7 @@ def _get_api_packet_spec_data(self):
         ret = self.__x64bit_addr.address
         ret += self.__x16bit_addr.address
         ret.append(self.__transmit_options)
-        ret += bytearray(self.__command, 'utf8')
+        ret += bytearray(self.__command, "utf8")
         return ret if self.__parameter is None else ret + self.__parameter
 
     def _get_api_packet_spec_data_dict(self):
@@ -936,7 +936,7 @@ def create_packet(raw, operating_mode):
             raise InvalidPacketException("This packet is not a remote AT command response packet.")
 
         return RemoteATCommandResponsePacket(raw[4], XBee64BitAddress(raw[5:13]),
-                                             XBee16BitAddress(raw[13:15]), str(raw[15:17].decode()),
+                                             XBee16BitAddress(raw[13:15]), raw[15:17].decode("utf8"),
                                              ATCommandStatus.get(raw[17]), raw[18:-1])
 
     def needs_id(self):
@@ -957,7 +957,7 @@ def _get_api_packet_spec_data(self):
         """
         ret = self.__x64bit_addr.address
         ret += self.__x16bit_addr.address
-        ret += bytearray(self.__command)
+        ret += bytearray(self.__command, "utf8")
         ret.append(self.__response_status.code)
         if self.__comm_value is not None:
             ret += self.__comm_value
@@ -1810,7 +1810,7 @@ def _get_api_packet_spec_data(self):
         """
         ret = self.__x64bit_addr.address
         ret += self.__x16bit_addr.address
-        ret.append(self.__receive_options.code)
+        ret.append(self.__receive_options)
         if self.__rf_data is not None:
             ret += self.__rf_data
         return ret

digi/xbee/packets/devicecloud.py

@@ -96,7 +96,7 @@ def create_packet(raw, operating_mode):
             raise InvalidPacketException("This packet is not a device request packet.")
 
         target_length = raw[7]
-        return DeviceRequestPacket(raw[4], str(raw[8:8 + target_length]), raw[8 + target_length:-1])
+        return DeviceRequestPacket(raw[4], raw[8:8 + target_length].decode("utf8"), raw[8 + target_length:-1])
 
     def needs_id(self):
         """
@@ -119,7 +119,7 @@ def _get_api_packet_spec_data(self):
         ret += utils.int_to_bytes(self.__flags, num_bytes=1)
         if self.__target is not None:
             ret += utils.int_to_bytes(len(self.__target), num_bytes=1)
-            ret += bytearray(self.__target, 'utf8')
+            ret += bytearray(self.__target, "utf8")
         else:
             ret += utils.int_to_bytes(0x00, num_bytes=1)
         if self.__request_data is not None:
@@ -723,8 +723,8 @@ def create_packet(raw, operating_mode):
         path_length = raw[5]
         content_type_length = raw[6 + path_length]
         return SendDataRequestPacket(raw[4],
-                                     str(raw[6:6 + path_length]),
-                                     str(raw[6 + path_length + 1:6 + path_length + 1 + content_type_length]),
+                                     raw[6:6 + path_length].decode("utf8"),
+                                     raw[6 + path_length + 1:6 + path_length + 1 + content_type_length].decode("utf8"),
                                      SendDataRequestOptions.get(raw[6 + path_length + 2 + content_type_length]),
                                      raw[6 + path_length + 3 + content_type_length:-1])
 

digi/xbee/packets/wifi.py

@@ -407,7 +407,7 @@ def _get_api_packet_spec_data(self):
         """
         ret = bytearray(self.__dest_address.packed)
         ret += utils.int_to_bytes(self.__transmit_options, num_bytes=1)
-        ret += bytearray(self.__command, 'utf8')
+        ret += bytearray(self.__command, "utf8")
         if self.__parameter is not None:
             ret += self.__parameter
         return ret