Apply patch for gdd

diff --git a/bin/appli_gen.py b/bin/appli_gen.py
index f63b631424eaa0a28fcf5a32d341e75b88c41750..47d3a0714738e18d1ac083398c948885d6688cc5 100755 (executable)
--- a/bin/appli_gen.py
+++ b/bin/appli_gen.py
@@ -271,7 +271,7 @@ def install(prefix, config_file, verbose=0):
         os.remove(salome_file)
     except:
         pass
-    env_modules = [m.encode('utf8') for m in _config.get('env_modules', [])]
+    env_modules = _config.get('env_modules', [])
     with open(salome_file, 'w') as fd:
         fd.write(salome_script.replace('MODULES = []', 'MODULES = {}'.format(env_modules)))
     os.chmod(salome_file, 0o755)

diff --git a/src/Utils/SALOME_utilities.py b/src/Utils/SALOME_utilities.py
index 3f82fe3e98feeb19b3853403d5e4034b91d3dcab..e84c9d3ab93dc1a98ea0055fe7c1fbf9b7511b2c 100644 (file)
--- a/src/Utils/SALOME_utilities.py
+++ b/src/Utils/SALOME_utilities.py
@@ -32,9 +32,8 @@ from launchConfigureParser import verbose
 
 def MYTRACE ():
     if verbose():
-        str = "- Trace "
-        GLogger.putMessage(str + "  : ")
-        
+        GLogger.putMessage("- Trace  : ")
+
 
 def REPERE():
     if verbose():
@@ -44,23 +43,21 @@ def REPERE():
 def BEGIN_OF(msg):
     if verbose():
         REPERE(); MYTRACE();
-        GLogger.putMessage("Begin of : "+ str(msg) + "\n")
+        GLogger.putMessage("Begin of : %s\n" % msg)
         REPERE();
 
 
 def END_OF(msg):
     if verbose():
         REPERE(); MYTRACE();
-        GLogger.putMessage("Normale end of : "+ str(msg) + "\n")
+        GLogger.putMessage("Normal end of : %s\n" % msg)
         REPERE();
 
 def MESSAGE(msg):
     if verbose():
         MYTRACE()
-        GLogger.putMessage(str(msg) + "\n")
+        GLogger.putMessage("%s\n" % msg)
 
 def SCRUTE(var_name, var_value):
     MYTRACE();
-    GLogger.putMessage(var_name + " = " + str(var_value) + "\n")
-
-   
+    GLogger.putMessage("%s = %s\n" % (var_name, var_value))