getUserName now uses the standard getpass module

diff --git a/bin/salome_utils.py b/bin/salome_utils.py
index 114793af0a476801849fb2e91fc588c24d8a455c..346db515ac7948fe4706e8ec5382752b72624d0b 100644 (file)
--- a/bin/salome_utils.py
+++ b/bin/salome_utils.py
@@ -116,8 +116,14 @@ def getUserName():
 
     :return user name
     """
-    return os.getenv('USERNAME', 'unknown') if sys.platform == 'win32' \
-        else os.getenv('USER', os.getenv('LOGNAME', 'unknown'))
+    if sys.platform == 'win32':
+        username = os.getenv('USERNAME')
+    else:
+        username = os.getenv('USER', os.getenv('LOGNAME'))
+    if username is None:
+        import getpass
+        username = getpass.getuser()
+    return username
 
 # ---