From fdd09d93de668aae9a4c28e6c51a19c822739bb1 Mon Sep 17 00:00:00 2001
From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Wed, 4 Oct 2017 14:56:20 +0200
Subject: [PATCH] Fix appliskel to work in python 3

---
 bin/appliskel/.salome_run | 91 +++++++++++++++++++--------------------
 bin/appliskel/salome      |  8 ++--
 2 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/bin/appliskel/.salome_run b/bin/appliskel/.salome_run
index 171036b0e..1eaeb9541 100755
--- a/bin/appliskel/.salome_run
+++ b/bin/appliskel/.salome_run
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
@@ -23,51 +23,50 @@ import os
 import sys
 
 def main(args):
-  # Identify application path then locate configuration files
-  currentPath = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
-  launcherFile = os.path.basename(__file__)
-  from salome_starter import initialize
-  initialize(currentPath, launcherFile)
-
-  if len(args) == 1 and args[0] in ['--help', 'help', '-h', '--h']:
-    from salomeContext import usage
-    usage()
-    sys.exit(0)
-
-  from salomeContextUtils import getConfigFileNames
-  configFileNames, args, unexisting = getConfigFileNames(args, checkExistence=True)
-
-  if len(unexisting) > 0:
-    print "ERROR: unexisting configuration/environment file(s): " + ', '.join(unexisting)
-    sys.exit(1)
-
-  # Create a SalomeContext which parses configFileNames to initialize environment
-  from salomeContextUtils import SalomeContextException
-  try:
-    from salomeContext import SalomeContext
-    context = SalomeContext(configFileNames)
-
-    # Here set specific variables, if needed
-    # context.addToPath('mypath')
-    # context.addToLdLibraryPath('myldlibrarypath')
-    # context.addToPythonPath('mypythonpath')
-    # context.setVariable('myvarname', 'value')
-
-    # Start SALOME, parsing command line arguments
-    out, err, returncode = context.runSalome(args)
-    if out:
-      sys.stdout.write(out)
-    if err:
-      sys.stderr.write(err)
-    #print 'Thank you for using SALOME!'
-    sys.exit(returncode)
-  except SalomeContextException, e:
-    import logging
-    logging.getLogger("salome").error(e)
-    sys.exit(1)
+    # Identify application path then locate configuration files
+    currentPath = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
+    launcherFile = os.path.basename(__file__)
+    from salome_starter import initialize
+    initialize(currentPath, launcherFile)
+    
+    if len(args) == 1 and args[0] in ['--help', 'help', '-h', '--h']:
+        from salomeContext import usage
+        usage()
+        sys.exit(0)
+    
+    from salomeContextUtils import getConfigFileNames
+    configFileNames, args, unexisting = getConfigFileNames(args, checkExistence=True)
+    
+    if len(unexisting) > 0:
+        print("ERROR: unexisting configuration/environment file(s): " + ', '.join(unexisting))
+        sys.exit(1)
+    
+    # Create a SalomeContext which parses configFileNames to initialize environment
+    from salomeContextUtils import SalomeContextException
+    try:
+        from salomeContext import SalomeContext
+        context = SalomeContext(configFileNames)
+        
+        # Here set specific variables, if needed
+        # context.addToPath('mypath')
+        # context.addToLdLibraryPath('myldlibrarypath')
+        # context.addToPythonPath('mypythonpath')
+        # context.setVariable('myvarname', 'value')
+        
+        # Start SALOME, parsing command line arguments
+        out, err, returncode = context.runSalome(args)
+        if out:
+          sys.stdout.write(out)
+        if err:
+          sys.stderr.write(err)
+        #print('Thank you for using SALOME!')
+        sys.exit(returncode)
+    except SalomeContextException as e:
+        import logging
+        logging.getLogger("salome").error(e)
+        sys.exit(1)
 #
 
 if __name__ == "__main__":
-  args = sys.argv[1:]
-  main(args)
-#
+    args = sys.argv[1:]
+    main(args)
diff --git a/bin/appliskel/salome b/bin/appliskel/salome
index d44507d2c..a57c5d701 100755
--- a/bin/appliskel/salome
+++ b/bin/appliskel/salome
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import os
 import subprocess
@@ -15,8 +15,8 @@ def main(args):
         env_modules_option = "--with-env-modules="
         env_modules_l = [x for x in args if x.startswith(env_modules_option)]
         if env_modules_l:
-          env_modules += env_modules_l[-1][len(env_modules_option):].split(',')
-          args = [x for x in args if not x.startswith(env_modules_option)]
+            env_modules += env_modules_l[-1][len(env_modules_option):].split(',')
+            args = [x for x in args if not x.startswith(env_modules_option)]
         env_modules_option += "%s" % ','.join(env_modules)
         args.append(env_modules_option)
 
@@ -27,5 +27,3 @@ def main(args):
 
 if __name__ == "__main__":
     main(sys.argv[1:])
-#
-
-- 
2.39.2