venv directory is configured in config_appli.xml file

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

diff --git a/src/Utils/Utils_Identity.py b/src/Utils/Utils_Identity.py
index 98911dc7defefb7e54c77da28a5f652890a261a3..ae771301166d32ea2fb0244b7fe7a26d1ff394b7 100644 (file)
--- a/src/Utils/Utils_Identity.py
+++ b/src/Utils/Utils_Identity.py
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -45,18 +45,19 @@ 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._adip =  socket.gethostbyname(self._machine) # IP address
         if sys.platform == "win32":
           self._uid  = os.getpid() 
           self._pwname = os.environ["USERNAME"]
@@ -80,7 +81,8 @@ try:
   s = file.readline()
   versnb = string.strip(string.split(s, ":")[1])
   dirname=".salome_"+versnb
-except:
+  file.close()
+except Exception:
   versnb = ""
   dirname=".salome"