CCAR: import_hook.py was too strict in ensure_list (ImportError raised)

[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 696cd48db3ee25d86436f5e61928c6d5cf3f7b0f..d6bbdf76d0daf117dd536b6389c5e26657089c76 100644 (file)
--- a/src/KERNEL_PY/salome_version.py
+++ b/src/KERNEL_PY/salome_version.py
@@ -1,4 +1,5 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  -*- coding: iso-8859-1 -*-
+#  Copyright (C) 2007-2010  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
@@ -19,10 +20,20 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : salome_version.py
 #  Author : Vadim SANDLER
 #  Module : SALOME
 #
+__ALL__ = [
+    "getVersion",
+    "getVersionMajor",
+    "getVersionMinor",
+    "getVersionRelease",
+    "getVersions",
+    "getXVersion",
+    ]
+
 _salome_versions = {}
 
 def getVersion( mod = "KERNEL" ):
@@ -107,3 +118,10 @@ def getVersions( mod = "KERNEL" ):
         pass
     return [ major, minor, rel ]
     
+def getXVersion( mod = "KERNEL" ):
+    """
+    Get SALOME module version as list of [major, minor, release] numbers
+    Returns: version numbers list
+    """
+    major, minor, rel = getVersions( mod )
+    return hex( (major<<16) + (minor<<8) + rel )