From c08881e6e17a2480fb307ee4c92d784386bdb97d Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Mon, 14 May 2018 15:16:02 +0200 Subject: [PATCH] Apply patch for gdd --- bin/appli_gen.py | 2 +- src/Utils/SALOME_utilities.py | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/bin/appli_gen.py b/bin/appli_gen.py index f63b63142..47d3a0714 100755 --- 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 3f82fe3e9..e84c9d3ab 100644 --- 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)) -- 2.39.2