Copyright update 2022

[modules/geom.git] / bin / geom_setenv.py

diff --git a/bin/geom_setenv.py b/bin/geom_setenv.py
index b4e8b747ac00edcb2b359775d1d33c49353fd8a9..4c1ea61c4c1d5100c69b4094067201b0e80af5b6 100644 (file)
--- a/bin/geom_setenv.py
+++ b/bin/geom_setenv.py
@@ -1,6 +1,5 @@
-#! /usr/bin/env python
-#  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+#! /usr/bin/env python3
+# Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +19,7 @@
 #
 
 import os, sys, string
-from salome_utils import getTmpDir, generateFileName, uniteFiles
+from salome_utils import getLogDir, generateFileName, uniteFiles
 from setenv import add_path, get_lib_dir, salome_subdir
 
 # -----------------------------------------------------------------------------
@@ -29,8 +28,8 @@ def set_env( args ):
     """Add to the PATH-variables modules specific paths"""
     psep = os.pathsep
     python_version="python%d.%d" % sys.version_info[0:2]
-    
-    tmp_dir = getTmpDir()
+
+    tmp_dir = getLogDir()
     env_dir = generateFileName( tmp_dir, prefix="env", with_port=True )
     res_dir = os.path.join( os.getenv( "GEOM_ROOT_DIR" ), "share", salome_subdir, "resources", "geom" )
 
@@ -58,7 +57,7 @@ def set_env( args ):
     plugin_list.append("AdvancedGEOM")
 
     # find additional plugins
-    for env_var in os.environ.keys():
+    for env_var in os.environ:
         value = os.environ[env_var]
         if env_var[-9:] == "_ROOT_DIR" and value:
             plugin_root = value
@@ -84,7 +83,7 @@ def set_env( args ):
                         plugin_list.append(plugin)
 
                         # add paths of plugin
-                        if not os.environ.has_key("SALOME_"+plugin+"Resources"):
+                        if "SALOME_"+plugin+"Resources" not in os.environ:
                             resource_path = os.path.join(plugin_root, "share", salome_subdir, "resources", plugin.lower())
                             os.environ["SALOME_"+plugin+"Resources"] = resource_path
                             resource_path_list.append(resource_path)