Merge pull request #457 from robszewczyk/bug/python3-support

Bug/python3 support

Author: robszewczyk

src/device-manager/python/build-openweave-wheel.py

@@ -20,6 +20,7 @@
 #      Builds a Python wheel package for OpenWeave.
 #
 
+from __future__ import absolute_import
 import sys
 import os
 import stat

src/device-manager/python/openweave/WeaveBleBase.py

@@ -20,13 +20,14 @@
 #      This file is Weave BLE Base class file
 #
 
+from __future__ import absolute_import
 import abc
 import shlex
 import optparse
 from optparse import OptionParser, Option, OptionValueError
+import six
 
-class WeaveBleBase(object):
-    __metaclass__ = abc.ABCMeta
+class WeaveBleBase(six.with_metaclass(abc.ABCMeta, object)):
     @abc.abstractmethod
     def scan(self, line):
         """ API to initiatae BLE scanning for -t user_timeout seconds."""

src/device-manager/python/openweave/WeaveBleUtility.py

@@ -20,9 +20,12 @@
 #      This file is uitilies for Weave BLE
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import binascii
 import logging
 from ctypes import *
+import six
 
 
 # Duplicates of BLE definitions in WeaveDeviceManager-ScriptBinding.cpp
@@ -54,7 +57,7 @@ def _VoidPtrToUUIDString(ptr, len):
         ptr = ptr[:8] + '-' + ptr[8:12] + '-' + ptr[12:16] + '-' + ptr[16:20] + '-' + ptr[20:]
         ptr = str(ptr)
     except:
-        print "ERROR: failed to convert void * to UUID"
+        print("ERROR: failed to convert void * to UUID")
         ptr = None
 
     return ptr
@@ -74,7 +77,7 @@ def _ByteArrayToVoidPtr(array):
         return c_void_p(0)
 
 def ParseBleEventType(val):
-    if isinstance(val, (int, long)):
+    if isinstance(val, six.integer_types):
         return val
     if (val.lower() == "rx"):
         return BleEventType_Rx
@@ -92,16 +95,16 @@ def __init__(self,  svcId=None, charId=None, status=False):
         self.Status = status
 
     def Print(self, prefix=""):
-        print "%sBleEvent Type: %s" % (prefix, ("TX" if self.EventType == BleEventType_Tx else "ERROR"))
-        print "%sStatus: %s" % (prefix, str(self.Status))
+        print("%sBleEvent Type: %s" % (prefix, ("TX" if self.EventType == BleEventType_Tx else "ERROR")))
+        print("%sStatus: %s" % (prefix, str(self.Status)))
 
         if self.SvcId:
-            print "%sSvcId:" % (prefix)
-            print binascii.hexlify(self.SvcId)
+            print("%sSvcId:" % (prefix))
+            print(binascii.hexlify(self.SvcId))
 
         if self.CharId:
-            print "%sCharId:" % (prefix)
-            print binascii.hexlify(self.CharId)
+            print("%sCharId:" % (prefix))
+            print(binascii.hexlify(self.CharId))
 
     def SetField(self, name, val):
         name = name.lower()
@@ -123,8 +126,8 @@ def __init__(self, error=0):
         self.Error = error
 
     def Print(self, prefix=""):
-        print "%sBleEvent Type: %s" % (prefix, ("DC" if self.EventType == BleEventType_Disconnect else "ERROR"))
-        print "%sError: %s" % (prefix, str(self.Error))
+        print("%sBleEvent Type: %s" % (prefix, ("DC" if self.EventType == BleEventType_Disconnect else "ERROR")))
+        print("%sError: %s" % (prefix, str(self.Error)))
 
     def SetField(self, name, val):
         name = name.lower()
@@ -144,18 +147,18 @@ def __init__(self, svcId=None, charId=None, buffer=None):
         self.Buffer = buffer
 
     def Print(self, prefix=""):
-        print "%sBleEvent Type: %s" % (prefix, ("RX" if self.EventType == BleEventType_Rx else "ERROR"))
+        print("%sBleEvent Type: %s" % (prefix, ("RX" if self.EventType == BleEventType_Rx else "ERROR")))
         if self.Buffer:
-            print "%sBuffer:" % (prefix)
-            print binascii.hexlify(self.Buffer)
+            print("%sBuffer:" % (prefix))
+            print(binascii.hexlify(self.Buffer))
 
         if self.SvcId:
-            print "%sSvcId:" % (prefix)
-            print binascii.hexlify(self.SvcId)
+            print("%sSvcId:" % (prefix))
+            print(binascii.hexlify(self.SvcId))
 
         if self.CharId:
-            print "%sCharId:" % (prefix)
-            print binascii.hexlify(self.CharId)
+            print("%sCharId:" % (prefix))
+            print(binascii.hexlify(self.CharId))
 
     def SetField(self, name, val):
         name = name.lower()
@@ -180,17 +183,17 @@ def __init__(self,  svcId=None, charId=None, status=True, operation=BleSubscribe
         self.Operation = operation
 
     def Print(self, prefix=""):
-        print "%sBleEvent Type: %s" % (prefix, ("SUBSCRIBE" if self.EventType == BleEventType_Subscribe else "ERROR"))
-        print "%sStatus: %s" % (prefix, str(self.Status))
-        print "%sOperation: %s" % (prefix, ("UNSUBSCRIBE" if self.Operation == BleSubscribeOperation_Unsubscribe else "SUBSCRIBE"))
+        print("%sBleEvent Type: %s" % (prefix, ("SUBSCRIBE" if self.EventType == BleEventType_Subscribe else "ERROR")))
+        print("%sStatus: %s" % (prefix, str(self.Status)))
+        print("%sOperation: %s" % (prefix, ("UNSUBSCRIBE" if self.Operation == BleSubscribeOperation_Unsubscribe else "SUBSCRIBE")))
 
         if self.SvcId:
-            print "%sSvcId:" % (prefix)
-            print binascii.hexlify(self.SvcId)
+            print("%sSvcId:" % (prefix))
+            print(binascii.hexlify(self.SvcId))
 
         if self.CharId:
-            print "%sCharId:" % (prefix)
-            print binascii.hexlify(self.CharId)
+            print("%sCharId:" % (prefix))
+            print(binascii.hexlify(self.CharId))
 
     def SetField(self, name, val):
         name = name.lower()

src/device-manager/python/openweave/WeaveBluezMgr.py

@@ -20,6 +20,8 @@
 #      BLE Central support for Weave Device Manager via BlueZ APIs.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import abc
 import dbus
 import dbus.service
@@ -34,21 +36,23 @@
 import time
 import traceback
 import uuid
-import Queue
+import six.moves.queue
 
 
 from ctypes import *
+import six
+from six.moves import range
 
 try:
     from gi.repository import GObject
 except:
     from pgi.repository import GObject
 
-from WeaveBleUtility import *
-from WeaveBleUtility import _VoidPtrToUUIDString
-from WeaveBleUtility import _VoidPtrToByteArray
+from .WeaveBleUtility import *
+from .WeaveBleUtility import _VoidPtrToUUIDString
+from .WeaveBleUtility import _VoidPtrToByteArray
 
-from WeaveBleBase import WeaveBleBase
+from .WeaveBleBase import WeaveBleBase
 
 weave_service = uuid.UUID('0000FEAF-0000-1000-8000-00805F9B34FB')
 weave_tx      = uuid.UUID('18EE2EF5-263D-4559-959F-4F9C429F9D11')
@@ -81,7 +85,7 @@ def get_bluez_objects(bluez, bus, interface, prefix_path):
     results = []
     if bluez is None or bus is None or interface is None or prefix_path is None:
         return results
-    for item in bluez.GetManagedObjects().iteritems():
+    for item in six.iteritems(bluez.GetManagedObjects()):
         delegates = item[1].get(interface)
         if not delegates:
             continue
@@ -166,7 +170,7 @@ def adapter_bg_scan(self, enable):
                     self.adapter.StopDiscovery()
                     self.logger.info("scanning stopped")
                 else:
-                    print "it has stopped scanning"
+                    print("it has stopped scanning")
             if action_flag:
                 if not self.adapter_event.wait(bleStatusTransitionTimeoutSec):
                     if enable:
@@ -697,7 +701,7 @@ def __init__(self, devMgr, logger=None):
                 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
         self.scan_quiet= False
         self.peripheral_list = []
-        self.weave_queue = Queue.Queue()
+        self.weave_queue = six.moves.queue.Queue()
         self.Gmainloop = None
         self.daemon_thread = None
         self.adapter = None
@@ -790,7 +794,7 @@ def running_thread(self, target, kwargs):
             while not self.Gmainloop or not self.Gmainloop.is_running():
                 time.sleep(0.00001)
             target(**kwargs)
-        except Exception, err:
+        except Exception as err:
             traceback.print_exc()
         finally:
             self.Gmainloop.quit()
@@ -954,7 +958,7 @@ def connect(self, identifier):
             else:
                 return False
         else:
-            print "device cannot be found"
+            print("device cannot be found")
             return False
 
     def disconnect(self):

src/device-manager/python/openweave/WeaveCoreBluetoothMgr.py

@@ -20,12 +20,14 @@
 #      BLE Central support for Weave Device Manager via OSX CoreBluetooth APIs.
 #
 
+from __future__ import absolute_import
+from __future__ import print_function
 import abc
 import logging
 import select
 import socket
 import sys
-import Queue
+import six.moves.queue
 import subprocess
 import threading
 import time
@@ -37,10 +39,10 @@
 import objc
 from PyObjCTools import AppHelper
 
-from WeaveBleUtility import *
-from WeaveBleUtility import _VoidPtrToByteArray
+from .WeaveBleUtility import *
+from .WeaveBleUtility import _VoidPtrToByteArray
 
-from WeaveBleBase import WeaveBleBase
+from .WeaveBleBase import WeaveBleBase
 
 
 objc.loadBundle("CoreBluetooth", globals(),
@@ -60,7 +62,7 @@ def _VoidPtrToCBUUID(ptr, len):
         ptr = ptr[:8] + '-' + ptr[8:12] + '-' + ptr[12:16] + '-' + ptr[16:20] + '-' + ptr[20:]
         ptr = CBUUID.UUIDWithString_(ptr)
     except:
-        print "ERROR: failed to convert void * to CBUUID"
+        print("ERROR: failed to convert void * to CBUUID")
         ptr = None
 
     return ptr
@@ -82,7 +84,7 @@ def __init__(self, devMgr, logger=None):
         self.characteristics = {}
         self.peripheral_list = []
         self.bg_peripheral_name = None
-        self.weave_queue = Queue.Queue()
+        self.weave_queue = six.moves.queue.Queue()
 
         self.manager = CBCentralManager.alloc()
         self.manager.initWithDelegate_queue_options_(self, None, None)