indigo-python: python 3 support

epam · Jun 6, 2013 · 2928357 · 2928357
1 parent 347f1ca
commit 2928357
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 65 deletions.
diff --git a/api/plugins/inchi/python/indigo_inchi.py b/api/plugins/inchi/python/indigo_inchi.py
@@ -50,7 +50,7 @@ def resetOptions(self):
 
     def loadMolecule(self, inchi):
         self.indigo._setSessionId()
-        res = self.indigo._checkResult(self._lib.indigoInchiLoadMolecule(inchi))
+        res = self.indigo._checkResult(self._lib.indigoInchiLoadMolecule(inchi.encode('ascii')))
         if res == 0:
             return None
         return self.indigo.IndigoObject(self.indigo, res)
@@ -65,7 +65,7 @@ def getInchi(self, molecule):
 
     def getInchiKey(self, inchi):
         self.indigo._setSessionId()
-        return self.indigo._checkResultString(self._lib.indigoInchiGetInchiKey(inchi))
+        return self.indigo._checkResultString(self._lib.indigoInchiGetInchiKey(inchi.encode('ascii')))
 
     def getWarning(self):
         self.indigo._setSessionId()

diff --git a/api/plugins/renderer/python/indigo_renderer.py b/api/plugins/renderer/python/indigo_renderer.py
@@ -46,7 +46,7 @@ def renderToBuffer(self, obj):
 
     def renderToFile(self, obj, filename):
         self.indigo._setSessionId()
-        self.indigo._checkResult(self._lib.indigoRenderToFile(obj.id, filename))
+        self.indigo._checkResult(self._lib.indigoRenderToFile(obj.id, filename.encode('ascii')))
 
     def renderGridToFile(self, objects, refatoms, ncolumns, filename):
         self.indigo._setSessionId()
@@ -55,10 +55,10 @@ def renderGridToFile(self, objects, refatoms, ncolumns, filename):
             if len(refatoms) != objects.count():
                 raise IndigoException("renderGridToFile(): refatoms[] size must be equal to the number of objects")
             arr = (c_int * len(refatoms))()
-            for i in xrange(len(refatoms)):
+            for i in range(len(refatoms)):
                 arr[i] = refatoms[i]
         self.indigo._checkResult(
-            self._lib.indigoRenderGridToFile(objects.id, arr, ncolumns, filename))
+            self._lib.indigoRenderGridToFile(objects.id, arr, ncolumns, filename.encode('ascii')))
 
     def renderGridToBuffer(self, objects, refatoms, ncolumns):
         self.indigo._setSessionId()
@@ -67,7 +67,7 @@ def renderGridToBuffer(self, objects, refatoms, ncolumns):
             if len(refatoms) != objects.count():
                 raise IndigoException("renderGridToBuffer(): refatoms[] size must be equal to the number of objects")
             arr = (c_int * len(refatoms))()
-            for i in xrange(len(refatoms)):
+            for i in range(len(refatoms)):
                 arr[i] = refatoms[i]
         wb = self.indigo.writeBuffer()
         self.indigo._checkResult(