Making use of existing python2to3.py

Author: jamesleesaunders

xbee/base.py

@@ -13,7 +13,7 @@
 """
 import struct, threading, time
 from xbee.frame import APIFrame
-from xbee.python2to3 import byteToInt, intToByte
+from xbee.python2to3 import byteToInt, intToByte, stringToBytes
 
 class ThreadQuitException(Exception):
     pass
@@ -182,7 +182,7 @@ def _build_command(self, cmd, **kwargs):
                 # Read this field's name from the function arguments dict
                 data = kwargs[field['name']]
                 if isinstance(data, str):
-                    data = str.encode(data)
+                    data = stringToBytes(data)
 
             except KeyError:
                 # Data wasn't given

xbee/python2to3.py

@@ -5,6 +5,7 @@
 
 Helper functions for handling Python 2 and Python 3 datatype shenanigans.
 """
+import sys
 
 def byteToInt(byte):
     """
@@ -31,4 +32,4 @@ def stringToBytes(s):
 
     Converts a string into an appropriate bytes object
     """
-    return s.encode('ascii')
+    return s.encode('ascii') if sys.version_info >= (3, 0) else s