X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FUtils%2FUtils_Identity.py;h=ae771301166d32ea2fb0244b7fe7a26d1ff394b7;hb=a4874256219c549a9b1ff740d549391c4bf2f25f;hp=4f4cc4520cf7d2febefa83ab9acaefad102dba09;hpb=2a9dfb2c5032dc3bfd0c6ac614be64703112f79d;p=modules%2Fkernel.git

diff --git a/src/Utils/Utils_Identity.py b/src/Utils/Utils_Identity.py
index 4f4cc4520..ae7713011 100644
--- a/src/Utils/Utils_Identity.py
+++ b/src/Utils/Utils_Identity.py
@@ -1,59 +1,93 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  SALOME Utils : general SALOME's definitions and tools
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  License along with this library; if not, write to the Free Software 
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
+#  SALOME Utils : general SALOME's definitions and tools
 #  File   : Utils_Identity.py
 #  Author : Estelle Deville, CEA
 #  Module : SALOME
 #  $Header$
-
+## @package Utils_Identity
+# \brief Module to get information about user and version
+#
 import sys
 import os
 import socket
-import pwd
+
+if not sys.platform == "win32":
+    import pwd
+
 import time
 import string
 
 def getShortHostName():
     """
     gives Hostname without domain extension.
+
     SALOME naming service needs short Hostnames (without domain extension).
-    HOSTNAME is not allways defined in environment,
+    HOSTNAME is not always defined in environment,
     socket.gethostname() gives short or complete Hostname, depending on
     defined aliases.
     """
-    return string.split(socket.gethostname(),'.')[0]
+    hostname = socket.gethostname()
+    return hostname.split('.')[0]
 
 class Identity:
     def __init__(self,name):
         self._name = name
         self._pid =  os.getpid()
         self._machine = socket.gethostname()
-        self._adip	=  socket.gethostbyname(self._machine) # IP adress
-        self._uid	= os.getuid() 
-        list = pwd.getpwuid(self._uid)
-        self._pwname	= list[0] # user name
-        self._tc_start	= time.time()
+        self._adip =  socket.gethostbyname(self._machine) # IP address
+        if sys.platform == "win32":
+          self._uid  = os.getpid() 
+          self._pwname = os.environ["USERNAME"]
+        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()
+        self._cdir = os.getcwd()
+
+def getapplipath():
+    """
+      Gives short application path (the complete path is $HOME/$APPLI)
+    """
+    return os.environ.get("APPLI",".salome_"+versnb)
+
+try:
+  file = open(os.path.join(os.environ["KERNEL_ROOT_DIR"],"bin","salome","VERSION"), "r")
+  s = file.readline()
+  versnb = string.strip(string.split(s, ":")[1])
+  dirname=".salome_"+versnb
+  file.close()
+except Exception:
+  versnb = ""
+  dirname=".salome"
+
+def version():
+    """
+      Gives salome version number
+    """
+    return versnb