From 9134c171aa97bd68778032b6e0c3f5b2b2e0536c Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 29 Jun 2017 13:04:04 +0300 Subject: [PATCH] Python3 porting: additional corrections. --- src/PYHELLO/PYHELLO.py | 5 +++-- src/PYHELLOGUI/PYHELLOGUI.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py index 3303c8f..a894bc9 100755 --- a/src/PYHELLO/PYHELLO.py +++ b/src/PYHELLO/PYHELLO.py @@ -29,7 +29,7 @@ import PYHELLO_ORB__POA import SALOME_ComponentPy import SALOME_DriverPy import SALOMEDS -from PYHELLO_utils import findOrCreateComponent, objectID, moduleName +from PYHELLO_utils import findOrCreateComponent, objectID, moduleName, getStudy class PYHELLO(PYHELLO_ORB__POA.PYHELLO_Gen, SALOME_ComponentPy.SALOME_ComponentPy_i, @@ -117,4 +117,5 @@ class PYHELLO(PYHELLO_ORB__POA.PYHELLO_Gen, abuffer[0:0] = [ "def RebuildData():" ] abuffer += [ " pass" ] abuffer += [ "\0" ] - return ("\n".join( abuffer ), 1) + res = "\n".join( abuffer ) + return (res.encode(), 1) diff --git a/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py index 9ded024..6e6104a 100644 --- a/src/PYHELLOGUI/PYHELLOGUI.py +++ b/src/PYHELLOGUI/PYHELLOGUI.py @@ -27,7 +27,7 @@ # import traceback -from PYHELLO_utils import (moduleName, getStudyManager, getObjectID, verbose, +from PYHELLO_utils import (moduleName, getObjectID, verbose, moduleID, objectID, getEngineIOR, getEngine) from SalomePyQt import (SalomePyQt, WT_ObjectBrowser, WT_PyConsole, PT_Selector, # @UnresolvedImport PT_String) # @UnresolvedImport -- 2.30.2