change in API methods

diff --git a/bin/appliskel/salome b/bin/appliskel/salome
index e61b6cbab6c3fcfb9d96043a328ebec13427d381..3ec2efe1088fc278ec4ff6765184262ff1332c01 100755 (executable)
--- a/bin/appliskel/salome
+++ b/bin/appliskel/salome
@@ -71,10 +71,10 @@ def main(args):
     # context.addToPath('mypath')
     # context.addToLdLibraryPath('myldlibrarypath')
     # context.addToPythonPath('mypythonpath')
-    # context.setEnviron('myvarname', 'value')
+    # context.setVariable('myvarname', 'value')
 
     # Start SALOME, parsing command line arguments
-    context.go(args)
+    context.runSalome(args)
     #print 'Thank you for using SALOME!'
 
   except SalomeContextException, e:

diff --git a/bin/salomeContext.py b/bin/salomeContext.py
index d7d282c9da8e3653b7448cbc26cb72bb28526d70..37f181a73a38a66c3db4e5d58e67dbd62bdae1b7 100644 (file)
--- a/bin/salomeContext.py
+++ b/bin/salomeContext.py
@@ -70,7 +70,7 @@ class SalomeContext:
   to .cfg format before setting the environment.
   """
   def __init__(self, configFileNames=[]):
-    #it could be None explicitely (if user use multiples setEnviron...for standalone)
+    #it could be None explicitely (if user use multiples setVariable...for standalone)
     if configFileNames==None:
        return
 
@@ -100,7 +100,7 @@ class SalomeContext:
         self.getLogger().warning("Unrecognized extension for configuration file: %s", filename)
   #
 
-  def go(self, args):
+  def runSalome(self, args):
     # Run this module as a script, in order to use appropriate Python interpreter
     # according to current path (initialized from environment files).
     kill = False
@@ -118,21 +118,21 @@ class SalomeContext:
 
   """Append value to PATH environment variable"""
   def addToPath(self, value):
-    self.addToEnviron('PATH', value)
+    self.addToVariable('PATH', value)
   #
 
   """Append value to LD_LIBRARY_PATH environment variable"""
   def addToLdLibraryPath(self, value):
-    self.addToEnviron('LD_LIBRARY_PATH', value)
+    self.addToVariable('LD_LIBRARY_PATH', value)
   #
 
   """Append value to PYTHONPATH environment variable"""
   def addToPythonPath(self, value):
-    self.addToEnviron('PYTHONPATH', value)
+    self.addToVariable('PYTHONPATH', value)
   #
 
   """Set environment variable to value"""
-  def setEnviron(self, name, value, overwrite=False):
+  def setVariable(self, name, value, overwrite=False):
     env = os.getenv(name, '')
     if env and not overwrite:
       self.getLogger().warning("Environment variable already existing (and not overwritten): %s=%s", name, value)
@@ -147,13 +147,13 @@ class SalomeContext:
   #
 
   """Unset environment variable"""
-  def unsetEnviron(self, name):
+  def unsetVariable(self, name):
     if os.environ.has_key(name):
       del os.environ[name]
   #
 
   """Append value to environment variable"""
-  def addToEnviron(self, name, value, separator=os.pathsep):
+  def addToVariable(self, name, value, separator=os.pathsep):
     if value == '':
       return
 
@@ -199,7 +199,7 @@ class SalomeContext:
   Args consist in a mandatory command followed by optionnal parameters.
   See usage for details on commands.
   """
-  def _getStarted(self, args):
+  def _startSalome(self, args):
     command, options = self.__parseArguments(args)
     sys.argv = options
 
@@ -234,17 +234,17 @@ class SalomeContext:
 
     # unset variables
     for var in unsetVars:
-      self.unsetEnviron(var)
+      self.unsetVariable(var)
 
     # set environment
     for reserved in reservedDict:
       a = filter(None, reservedDict[reserved]) # remove empty elements
       reformattedVals = ':'.join(a)
-      self.addToEnviron(reserved, reformattedVals)
+      self.addToVariable(reserved, reformattedVals)
       pass
 
     for key,val in configVars:
-      self.setEnviron(key, val, overwrite=True)
+      self.setVariable(key, val, overwrite=True)
       pass
 
     sys.path[:0] = os.getenv('PYTHONPATH','').split(':')
@@ -390,7 +390,7 @@ if __name__ == "__main__":
   if len(sys.argv) == 3:
     context = pickle.loads(sys.argv[1])
     args = pickle.loads(sys.argv[2])
-    (out, err) = context._getStarted(args)
+    (out, err) = context._startSalome(args)
     if out:
       sys.stdout.write(out)
     if err: