[PY3] Fix m4 macro for python 3

[modules/kernel.git] / src / KERNEL_PY / salome_version.py

diff --git a/src/KERNEL_PY/salome_version.py b/src/KERNEL_PY/salome_version.py
index a6d5e54237164579109bbfbbbae32b7751fde516..1642ed9a7a4f1b9da943ef08785b8c8510d7a11c 100644 (file)
--- a/src/KERNEL_PY/salome_version.py
+++ b/src/KERNEL_PY/salome_version.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  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
@@ -49,7 +49,7 @@ def getVersion( mod = "KERNEL", full = False ):
     global _salome_versions
     mod = mod.upper()
     dev_flag = { True : "dev", False : "" }
-    if not _salome_versions.has_key( mod ):
+    if mod not in _salome_versions:
         _salome_versions[ mod ] = [ None, "" ]
         import os
         root_dir = os.getenv( "%s_ROOT_DIR" % mod )
@@ -75,7 +75,7 @@ def getVersion( mod = "KERNEL", full = False ):
     v = _salome_versions[ mod ][ 0 ]
     if full and v is not None:
         v += _salome_versions[ mod ][ 1 ]
-    return v
+    return v is not None and v or ""
 
 def getVersionMajor( mod = "KERNEL" ):
     """