Integration of a patch from Renaud Barate which fixes some issues at install step...

diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py
index 4f9a01044a9583a0ad9efa4a914034fc08392cea..0f04c80f13a26e7255764a2ac08fe0002f054633 100644 (file)
--- a/src/GEOM_PY/geomtools.py
+++ b/src/GEOM_PY/geomtools.py
@@ -22,7 +22,6 @@
 This module provides tools to facilitate the use of geom engine and geom
 objects in Salome.
 """
-
 import salome
 GEOM = None    # GEOM module is loaded only when needed
 
@@ -32,10 +31,9 @@ logger = Logger("salome.geom.geomtools", color = termcolor.RED)
 
 from salome.kernel.studyedit import getActiveStudyId, getStudyEditor
 from salome.kernel.services import IDToObject, IDToSObject
-try:
+from salome.kernel.deprecation import is_called_by_sphinx
+if not is_called_by_sphinx():
     from salome.gui import helper as guihelper
-except:
-    pass
 
 _geompys = {}
 

diff --git a/src/GEOM_PY/sketcher.py b/src/GEOM_PY/sketcher.py
index 7a20387ecd23956f5f1e549e5095dff633905982..c85c4ea0956bb6639463f60ab317551ab563a76a 100644 (file)
--- a/src/GEOM_PY/sketcher.py
+++ b/src/GEOM_PY/sketcher.py
@@ -44,17 +44,14 @@ Example::
 
 Additionnal examples can be found as unit tests in the source code.
 """
-
+from salome.kernel.deprecation import is_called_by_sphinx
 geompyEnable = True
-try:
+if not is_called_by_sphinx():
     import salome
     salome.salome_init()
     import GEOM
     from salome.geom import geomBuilder
     geompy = geomBuilder.New(salome.myStudy)
-except:
-    geompyEnable = False
-    
 
 class Sketcher: