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

Python3 compatibility for DeviceManager

Author: robszewczyk

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

@@ -162,8 +162,9 @@ def finalize_options(self):
             'License :: OSI Approved :: Apache Software License',
             'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
         ],
-        python_requires='>=2.7, <3',
+        python_requires='>=2.7',
         packages=[
             'openweave'                     # Arrange to install a package named "openweave"
         ],

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

@@ -100,7 +100,7 @@ def _VoidPtrToByteArray(ptr, len):
 
 def _ByteArrayToVoidPtr(array):
     if array != None:
-        if not (isinstance(array, str) or isinstance(array, bytearray)):
+        if not (isinstance(array, bytes) or isinstance(array, bytearray)):
             raise TypeError("Array must be an str or a bytearray")
         return cast( (c_byte * len(array)) .from_buffer_copy(array), c_void_p)
     else:
@@ -853,6 +853,9 @@ def HandlePairTokenComplete(devMgr, reqState, tokenPairingBundlePtr, tokenPairin
 
         cbHandlePairTokenComplete = _PairTokenCompleteFunct(HandlePairTokenComplete)
 
+        if pairingToken is not None and isinstance(pairingToken, str):
+            pairingToken = _StringToCString(pairingToken)
+
         return self._CallDevMgrAsync(
             lambda: _dmLib.nl_Weave_DeviceManager_PairToken(self.devMgr, _ByteArrayToVoidPtr(pairingToken), len(pairingToken), cbHandlePairTokenComplete, self.cbHandleError)
         )
@@ -1017,6 +1020,12 @@ def RegisterServicePairAccount(self, serviceId, accountId, serviceConfig, pairin
         if accountId is not None and '\x00' in accountId:
             raise ValueError("Unexpected NUL character in accountId")
 
+        if pairingToken is not None and isinstance(pairingToken, str):
+            pairingToken = _StringToCString(pairingToken)
+
+        if pairingInitData is not None and isinstance(pairingInitData, str):
+            pairingInitData = _StringToCString(pairingInitData)
+
         self._CallDevMgrAsync(
             lambda: _dmLib.nl_Weave_DeviceManager_RegisterServicePairAccount(self.devMgr, serviceId, _StringToCString(accountId),
                                                       _ByteArrayToVoidPtr(serviceConfig), len(serviceConfig),