untabify

[modules/kernel.git] / src / Utils / Utils_Identity.py

diff --git a/src/Utils/Utils_Identity.py b/src/Utils/Utils_Identity.py
index 908ce585bae8cb5e84b28b59d15cc382cd1a1063..91a19e24971485b9bbc640f0a5010c204bfce58c 100644 (file)
--- a/src/Utils/Utils_Identity.py
+++ b/src/Utils/Utils_Identity.py
@@ -1,4 +1,5 @@
 #! /usr/bin/env python
+#  -*- coding: iso-8859-1 -*-
 #  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
@@ -37,11 +38,6 @@ import socket
 
 if not sys.platform == "win32":
     import pwd
-    def getUserName(uid):
-      return pwd.getpwuid(uid)[0]
-else:
-    def getUserName(uid):
-      return os.environ["USER"]
 
 import time
 import string
@@ -63,8 +59,14 @@ class Identity:
         self._pid =  os.getpid()
         self._machine = socket.gethostname()
         self._adip =  socket.gethostbyname(self._machine) # IP adress        
-        self._uid = os.getpid() 
-        self._pwname = getUserName(self._uid)
+        if sys.platform == "win32":
+          self._uid  = os.getpid() 
+          self._pwname = os.environ["USER"]
+        else:
+          self._uid = os.getuid()
+          list = pwd.getpwuid(self._uid)
+          self._pwname  = list[0] # user name
+
         self._tc_start = time.time()
         self._cstart    = time.ctime(self._tc_start)
         self._cdir = os.getcwd()