GDD: temporaly remove sphynx doc generation

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b2d61e363a93cb4fed17ec34fee15daefa08303a..f48046a3c061e078af1b331aa6996c66fc66865f 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,7 +22,8 @@
 # Date : 30/11/2001
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 #
-SUBDIRS = salome docutils
+#SUBDIRS = salome docutils
+SUBDIRS = salome
 
 usr_docs:
        (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)

diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py
index 9f10c4c2653020ec2b78b0973456dc0c4f87a252..8b243a9b617ef3de7e9ff0f764df629ec3a03987 100644 (file)
--- a/src/GEOM_PY/geomtools.py
+++ b/src/GEOM_PY/geomtools.py
@@ -31,7 +31,7 @@ from salome.kernel import termcolor
 logger = Logger("salome.geom.geomtools", color = termcolor.RED)
 
 from salome.kernel.studyedit import getActiveStudyId, getStudyEditor
-from salome.gui.helper import getSObjectSelected
+from salome.gui import helper
 from salome.kernel.services import IDToObject
 
 _geompys = {}
@@ -88,7 +88,7 @@ class GeomStudyTools:
         if GEOM is None:
             GEOM = __import__("GEOM")
         if studyEditor is None:
-            studyEditor = getStudyEditor()
+            studyEditor = helper.getStudyEditor()
         self.editor = studyEditor
 
     def displayShapeByName(self, shapeName, color = None):
@@ -124,7 +124,7 @@ class GeomStudyTools:
         '''
         Returns the GEOM object currently selected in the objects browser.
         '''
-        sobject, entry = getSObjectSelected()
+        sobject, entry = helper.getSObjectSelected()
         geomObject = self.getGeomObjectFromEntry(entry)
         return geomObject