Simplification du launcher:

[tools/sat.git] / src / architecture.py

diff --git a/src/architecture.py b/src/architecture.py
index d10b06c69a371ca70022e26bd3e7afe952e12745..8e16c226caaf641fea149f215317bcf798ac38cb 100644 (file)
--- a/src/architecture.py
+++ b/src/architecture.py
@@ -17,10 +17,11 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 '''
-In this file : all the stuff that can change with the architecture on which SAT is running
+In this file : all the stuff that can change with the architecture 
+on which SAT is running
 '''
 
-import os, sys, platform, pwd
+import os, sys, platform
 
 def is_windows():
     '''method that checks windows OS
@@ -40,6 +41,7 @@ def get_user():
             raise Exception('USERNAME environment variable not set')
         return os.environ['USERNAME']
     else: # linux
+        import pwd
         return pwd.getpwuid(os.getuid())[0]
 
 def _lsb_release(args):
@@ -56,21 +58,24 @@ def _lsb_release(args):
             path = lsb_path + ":" + path
         
         from subprocess import Popen, PIPE
-        res = Popen(['lsb_release', args], env={'PATH': path}, stdout=PIPE).communicate()[0][:-1]
+        res = Popen(['lsb_release', args], env={'PATH': path},
+                     stdout=PIPE).communicate()[0][:-1]
         # in case of python3, convert byte to str
         if isinstance(res, bytes):
             res = res.decode()
         return res
     except OSError:
         sys.stderr.write(_(u"lsb_release not installed\n"))
-        sys.stderr.write(_(u"You can define $LSB_PATH to give the path to lsb_release\n"))
+        sys.stderr.write(_(u"You can define $LSB_PATH to give"
+                           " the path to lsb_release\n"))
         sys.exit(-1)
 
 def get_distribution(codes):
     '''Gets the code for the distribution
     
     :param codes L{Mapping}: The map containing distribution correlation table.
-    :return: The distribution on which salomeTools is running, regarding the distribution correlation table contained in codes variable.
+    :return: The distribution on which salomeTools is running, regarding the 
+             distribution correlation table contained in codes variable.
     :rtype: str
     '''
     if is_windows():
@@ -82,7 +87,8 @@ def get_distribution(codes):
         distrib = codes[distrib]
     else:
         sys.stderr.write(_(u"Unknown distribution: '%s'\n") % distrib)
-        sys.stderr.write(_(u"Please add your distribution to data/distrib.pyconf\n"))
+        sys.stderr.write(_(u"Please add your distribution to"
+                           " src/internal_config/distrib.pyconf\n"))
         sys.exit(-1)
 
     return distrib
@@ -93,7 +99,9 @@ def get_distrib_version(distrib, codes):
     
     :param distrib str: The distribution on which the version will be found.
     :param codes L{Mapping}: The map containing distribution correlation table.
-    :return: The version of the distribution on which salomeTools is running, regarding the distribution correlation table contained in codes variable.
+    :return: The version of the distribution on which salomeTools is running, 
+             regarding the distribution correlation table contained in codes 
+             variable.
     :rtype: str
     '''
 
@@ -119,7 +127,8 @@ def get_python_version():
     return platform.python_version()
 
 def get_nb_proc():
-    '''Gets the number of processors of the machine on which salomeTools is running.
+    '''Gets the number of processors of the machine 
+       on which salomeTools is running.
     
     :return: the number of processors.
     :rtype: str