Issue #803: Put all the python modules in the same python package newgeom

diff --git a/CMakeCommon/UnitTest.cmake b/CMakeCommon/UnitTest.cmake
index 010d52f7c62ae636a1315725f8bf25e45dc0ed4a..626769505cb3d96b6f1617118a6d4dd3fb567b41 100644 (file)
--- a/CMakeCommon/UnitTest.cmake
+++ b/CMakeCommon/UnitTest.cmake
@@ -30,12 +30,12 @@ MACRO(ADD_UNIT_TESTS)
     SET(_JUSTPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_BIN};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES};${SUIT_LIB_DIR};$ENV{PATH}")
     STRING(REPLACE "\\" "/" _JUSTPATH "${_JUSTPATH}")
     STRING(REPLACE ";" "\\;" _JUSTPATH "${_JUSTPATH}")
-    SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PYTHON_API};$ENV{PYTHONPATH}")
+    SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS};$ENV{PYTHONPATH}")
     STRING(REPLACE "\\" "/" _PYTHONPATH "${_PYTHONPATH}")
     STRING(REPLACE ";" "\\;" _PYTHONPATH "${_PYTHONPATH}")
   else()
     SET(_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_BIN}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}:${SUIT_LIB_DIR}:$ENV{LD_LIBRARY_PATH}")
-    SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PYTHON_API}:$ENV{PYTHONPATH}")
+    SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS}:$ENV{PYTHONPATH}")
   endif()
 
   foreach(eachFileName ${ARGN})

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 487d771566bfd6559db23f840020a931b5ec0df0..2d419ae1bc5b017e99d6f3e6ebdc4e2d48af0568 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,14 +36,15 @@ ENDIF()
 # It could be called only once
 FIND_PACKAGE(LibXml2 REQUIRED)
 
+SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/salome)
+SET(SHAPER_INSTALL_PYTHON_API ${_pydir}/salome/shaper CACHE INTERNAL "" FORCE)
+SET(SHAPER_INSTALL_SWIG ${_pydir} CACHE INTERNAL "" FORCE)
 IF(${HAVE_SALOME})
     SET(SHAPER_INSTALL_ADDONS bin/salome CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_BIN lib/salome CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_PLUGIN_FILES lib/salome CACHE INTERNAL "" FORCE)
-    SET(SHAPER_INSTALL_PYTHON_API bin/salome CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_PYTHON_FILES bin/salome CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE)
-    SET(SHAPER_INSTALL_SWIG bin/salome CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_QM_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_XML_RESOURCES share/salome/resources/shaper CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_GUI_DOC share/doc/salome/gui/SHAPER CACHE INTERNAL "" FORCE)
@@ -54,10 +55,8 @@ ELSE(${HAVE_SALOME})
     SET(SHAPER_INSTALL_ADDONS addons CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_BIN bin CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_PLUGIN_FILES plugins CACHE INTERNAL "" FORCE)
-    SET(SHAPER_INSTALL_PYTHON_API PythonAPI CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_PYTHON_FILES plugins CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_RESOURCES resources CACHE INTERNAL "" FORCE)
-    SET(SHAPER_INSTALL_SWIG swig CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_QM_RESOURCES bin CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_XML_RESOURCES plugins CACHE INTERNAL "" FORCE)
     SET(SHAPER_INSTALL_GUI_DOC doc CACHE INTERNAL "" FORCE)

diff --git a/env_Salome.bat b/env_Salome.bat
index 26ef1f6d74a4d61b212548711c451504a29c3844..996b0c07c668a33289ceb449f762b10712f8773e 100644 (file)
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -101,6 +101,7 @@ IF "%ARCH%" == "Win64" (
 
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
 @SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%
-@SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%PYTHONPATH%
+REM @SET PYTHONPATH=%SHAPER_ROOT_DIR%\lib\python2.7\site-packages\salome\salome;%PYTHONPATH%
+REM @SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%PYTHONPATH%
 
 @SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui

diff --git a/salomeRun_deb.bat b/salomeRun_deb.bat
index 75015844b2dcaa67bf0f2e862bec112959c9ffb0..85fcc0fd2de0d6cda9e43c6162713fbcc3801852 100644 (file)
--- a/salomeRun_deb.bat
+++ b/salomeRun_deb.bat
@@ -6,4 +6,5 @@ call env_Salome.bat d
 @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
 @SET SalomeAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
 
+echo %PYTHONPATH%
 start %PYTHONBIN% "%KERNEL_ROOT_DIR%\bin\salome\envSalome.py" "%PYTHONBIN%" "%KERNEL_ROOT_DIR%\bin\salome\runSalome.py" %*

diff --git a/src/BuildPlugin/Test/TestEdge.py b/src/BuildPlugin/Test/TestEdge.py
index 648aa57d8208189781516ad99aaab76aa62eb8f6..527358d3e7567385ac8ff78d875acacc6aca4811 100644 (file)
--- a/src/BuildPlugin/Test/TestEdge.py
+++ b/src/BuildPlugin/Test/TestEdge.py
@@ -55,5 +55,5 @@ aSession.finishOperation()
 # Test results
 assert (len(anEdgeFeature.results()) == aNumOfLines)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/BuildPlugin/Test/TestFace.py b/src/BuildPlugin/Test/TestFace.py
index 9f4b9e8281aec7ccc952247a9152e581dc3cefad..e4f6bd58ad635f678ec4d9c0319d7b58c10ca622 100644 (file)
--- a/src/BuildPlugin/Test/TestFace.py
+++ b/src/BuildPlugin/Test/TestFace.py
@@ -63,5 +63,5 @@ aSession.finishOperation()
 # Test results
 assert (len(aFaceFeature.results()) > 0)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/BuildPlugin/Test/TestShell.py b/src/BuildPlugin/Test/TestShell.py
index 2406a93b51bf87a296cfbe5d31eceda085a29786..24c6cb9ff1a962100915a96e4bee3d29b9b95fc2 100644 (file)
--- a/src/BuildPlugin/Test/TestShell.py
+++ b/src/BuildPlugin/Test/TestShell.py
@@ -78,5 +78,5 @@ aSession.finishOperation()
 # Test results
 assert (len(aShellFeature.results()) > 0)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/BuildPlugin/Test/TestSubShapes.py b/src/BuildPlugin/Test/TestSubShapes.py
index dbe6d695def133e29d108d1fc80c5a00be6e8cc3..1453d8af7ddfa14f4ac3cef5c4a488529f2a8be9 100644 (file)
--- a/src/BuildPlugin/Test/TestSubShapes.py
+++ b/src/BuildPlugin/Test/TestSubShapes.py
@@ -127,7 +127,7 @@ aSession.finishOperation()
 # Test results
 assert (len(aSubShapesFeature.results()) > 0)
 
-import model
+from salome.shaper import model
 
 model.begin()
 partSet = model.moduleDocument()

diff --git a/src/BuildPlugin/Test/TestVertex.py b/src/BuildPlugin/Test/TestVertex.py
index d292e6aafd568124430f16c3d8eea192f4bf74e0..be6c50e79456c01b0f7ea9d402851c8acfc69b75 100644 (file)
--- a/src/BuildPlugin/Test/TestVertex.py
+++ b/src/BuildPlugin/Test/TestVertex.py
@@ -56,5 +56,5 @@ aSession.finishOperation()
 # Test results
 assert (len(aVertexFeature.results()) == aNumOfPoints)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/BuildPlugin/Test/TestWire.py b/src/BuildPlugin/Test/TestWire.py
index 8598eac579535946268abed82951e5396783a7a0..06ce341922ff71cb1fe859368de41bbad5f55bc3 100644 (file)
--- a/src/BuildPlugin/Test/TestWire.py
+++ b/src/BuildPlugin/Test/TestWire.py
@@ -63,7 +63,7 @@ aSession.finishOperation()
 # Test results
 assert (len(aWireFeature.results()) > 0)
 
-import model
+from salome.shaper import model
 
 model.begin()
 partSet = model.moduleDocument()

diff --git a/src/CollectionPlugin/Test/TestField.py b/src/CollectionPlugin/Test/TestField.py
index d6ae47a5667fce2a0e33e1194a2da4a641a8bc98..722575fdffec0850194fc67bd6f28982f47e31ef 100644 (file)
--- a/src/CollectionPlugin/Test/TestField.py
+++ b/src/CollectionPlugin/Test/TestField.py
@@ -174,5 +174,5 @@ aSession.finishOperation()
 aFieldResult = aField.firstResult()
 assert(aFieldResult)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/CollectionPlugin/Test/TestGroup.py b/src/CollectionPlugin/Test/TestGroup.py
index 139d41208c84a86e524ce2b3f75bcb0108356343..4c21a570a3a3ab323b0a8c96677fc00fff5e7aaf 100644 (file)
--- a/src/CollectionPlugin/Test/TestGroup.py
+++ b/src/CollectionPlugin/Test/TestGroup.py
@@ -243,5 +243,5 @@ assert(aGroupResult.shape())
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ConnectorAPI/Test/TestExportToGEOM.py b/src/ConnectorAPI/Test/TestExportToGEOM.py
index 5ae5996bd6534bdeb6413162ec78df1c4c724aa9..d616057c82cdd52b57ea150ebac1bb512f3b5088 100644 (file)
--- a/src/ConnectorAPI/Test/TestExportToGEOM.py
+++ b/src/ConnectorAPI/Test/TestExportToGEOM.py
@@ -1,4 +1,4 @@
-import model
+from salome.shaper import model
 
 model.begin()
 partSet = model.moduleDocument()

diff --git a/src/ConstructionAPI/Test/TestAxis.py b/src/ConstructionAPI/Test/TestAxis.py
index ddce019986744cce1816df5fe1cf39d3bb893bcf..94a09317196c6da27c86f434be24a6f39c4c33f6 100644 (file)
--- a/src/ConstructionAPI/Test/TestAxis.py
+++ b/src/ConstructionAPI/Test/TestAxis.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 import ConstructionAPI
-import model
+from salome.shaper import model
 
 class AxisTestCase(unittest.TestCase):
 

diff --git a/src/ConstructionAPI/Test/TestPoint.py b/src/ConstructionAPI/Test/TestPoint.py
index 929610f575eeee4793c7f05f6cd2973a314726f0..1217d16ea1eb5a9339d2fddd3a761ac6216ca910 100644 (file)
--- a/src/ConstructionAPI/Test/TestPoint.py
+++ b/src/ConstructionAPI/Test/TestPoint.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 import ConstructionAPI
-import model
+from salome.shaper import model
 
 class PointTestCase(unittest.TestCase):
 

diff --git a/src/ConstructionPlugin/Test/TestAxisCreation.py b/src/ConstructionPlugin/Test/TestAxisCreation.py
index 61b3dfd7f2280e8e222de598a12ab169ce2e17ec..f9ef91118aae8d624499ca51ae1d9e4f47a13e93 100644 (file)
--- a/src/ConstructionPlugin/Test/TestAxisCreation.py
+++ b/src/ConstructionPlugin/Test/TestAxisCreation.py
@@ -8,7 +8,7 @@ from GeomAPI import *
 import math
 from ModelAPI import *
 
-import model
+from salome.shaper import model
 
 aSession = ModelAPI_Session.get()
 aDocument = aSession.moduleDocument()
@@ -189,5 +189,4 @@ anAxis = model.addAxis(aPart, aPlane1.result(), 50, False, aPlane2.result(), 100
 aSession.finishOperation()
 assert (len(anAxis.results()) > 0)
 
-import model
 assert(model.checkPythonDump())

diff --git a/src/ConstructionPlugin/Test/TestPlane.py b/src/ConstructionPlugin/Test/TestPlane.py
index 6669c2d1b3cdc60041db827c7d5a46ab457dcea7..87839997ed4f77d0b168dcd84976efe7361b3723 100644 (file)
--- a/src/ConstructionPlugin/Test/TestPlane.py
+++ b/src/ConstructionPlugin/Test/TestPlane.py
@@ -4,7 +4,7 @@ Test case for Construction Plane feature. Written on High API.
 from ModelAPI import *
 from GeomAPI import *
 
-import model
+from salome.shaper import model
 
 # Get session
 aSession = ModelAPI_Session.get()
@@ -83,5 +83,4 @@ aPlane = model.addPlane(aDocument, aCoincidentPlane.result(), aPlane.result())
 aSession.finishOperation()
 assert (len(aPlane.results()) > 0)
 
-import model
 assert(model.checkPythonDump())

diff --git a/src/ConstructionPlugin/Test/TestPoint.py b/src/ConstructionPlugin/Test/TestPoint.py
index 2614281bc439e91f9cb105d18b8e506cfc837fd8..c33cba37c25f792e2e688d38c529e5fd3a1399e9 100644 (file)
--- a/src/ConstructionPlugin/Test/TestPoint.py
+++ b/src/ConstructionPlugin/Test/TestPoint.py
@@ -4,7 +4,7 @@ Test case for Construction Point feature. Written on High API.
 from ModelAPI import *
 from GeomAPI import *
 
-import model
+from salome.shaper import model
 
 # Get session
 aSession = ModelAPI_Session.get()

diff --git a/src/ConstructionPlugin/Test/TestPointName.py b/src/ConstructionPlugin/Test/TestPointName.py
index 9d17c2294d5427a10122ef646de6a2144a3f1243..a46f46ee7c852c6eb24f667392835fd892b7239e 100644 (file)
--- a/src/ConstructionPlugin/Test/TestPointName.py
+++ b/src/ConstructionPlugin/Test/TestPointName.py
@@ -21,5 +21,5 @@ aFeature1Name = aFeature1.data().name()
 
 assert (aFeatureName == aFeature1Name)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ConstructionPlugin/Test/UnitTestAxis.py b/src/ConstructionPlugin/Test/UnitTestAxis.py
index c626e6de00fe238039f50d9e00d0136fa9ee0c5a..17c1db355c48d867749067947a976b9831da2222 100644 (file)
--- a/src/ConstructionPlugin/Test/UnitTestAxis.py
+++ b/src/ConstructionPlugin/Test/UnitTestAxis.py
@@ -75,5 +75,5 @@ aSession.finishOperation()
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ExchangeAPI/Test/TestExchange.py b/src/ExchangeAPI/Test/TestExchange.py
index d628d4f015d628203888fd68336cfece40ca2ecd..df49a15ded697f959f07e0dea16a3769380dfb78 100644 (file)
--- a/src/ExchangeAPI/Test/TestExchange.py
+++ b/src/ExchangeAPI/Test/TestExchange.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 import ExchangeAPI
-import model
+from salome.shaper import model
 
 class ExchangeTestCase(unittest.TestCase):
 

diff --git a/src/ExchangePlugin/ExchangePlugin_Dump.cpp b/src/ExchangePlugin/ExchangePlugin_Dump.cpp
index 168e9dc197756f19592aab502c1ae363d94d6b2d..e81c896aa45666d79de087f4343692445b3d5c36 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_Dump.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_Dump.cpp
@@ -43,7 +43,7 @@ void ExchangePlugin_Dump::execute()
 void ExchangePlugin_Dump::dump(const std::string& theFileName)
 {
   // load DumpAssistant from Python side
-  Config_ModuleReader::loadScript("model.dump");
+  Config_ModuleReader::loadScript("salome.shaper.model.dump");
 
   ModelHighAPI_Dumper* aDumper = ModelHighAPI_Dumper::getInstance();
   aDumper->clear();

diff --git a/src/ExchangePlugin/Test/TestExport.py b/src/ExchangePlugin/Test/TestExport.py
index ffd7f04c0715cc8ec42b8ce8e3830b29d6a9ecd7..fd590cbe3369372c19f5f32e678a299b30da9ed5 100644 (file)
--- a/src/ExchangePlugin/Test/TestExport.py
+++ b/src/ExchangePlugin/Test/TestExport.py
@@ -12,7 +12,7 @@ from ModelAPI import *
 
 from TestImport import testImport
 
-import model
+from salome.shaper import model
 
 __updated__ = "2015-05-22"
 

diff --git a/src/ExchangePlugin/Test/TestImport.py b/src/ExchangePlugin/Test/TestImport.py
index 63e364baa38ef2a41d66c11c2ff6ca61724c0895..1f5b39dad6b8f95ae8e80197cfb438c90c0dd089 100644 (file)
--- a/src/ExchangePlugin/Test/TestImport.py
+++ b/src/ExchangePlugin/Test/TestImport.py
@@ -121,5 +121,5 @@ if __name__ == '__main__':
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesAPI/Test/APIParam_Translation.py b/src/FeaturesAPI/Test/APIParam_Translation.py
index 6795c25b8499f078336ddf93a04292448fe27922..a24515ae6d4a75caf8c9d382786c55604648ac07 100644 (file)
--- a/src/FeaturesAPI/Test/APIParam_Translation.py
+++ b/src/FeaturesAPI/Test/APIParam_Translation.py
@@ -5,7 +5,7 @@ Written on High API.
 from ModelAPI import *
 from GeomAPI import *
 
-import model
+from salome.shaper import model
 
 # Get session
 aSession = ModelAPI_Session.get()

diff --git a/src/FeaturesPlugin/Test/TestBoolean.py b/src/FeaturesPlugin/Test/TestBoolean.py
index 8c6b67fd20b949003cb1a1a84e8aa8dad790bc60..968263eaa732fa79c2d7f3ad4e561be1a7a08ce1 100644 (file)
--- a/src/FeaturesPlugin/Test/TestBoolean.py
+++ b/src/FeaturesPlugin/Test/TestBoolean.py
@@ -119,7 +119,7 @@ assert (aBooleanResult is not None)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 
 model.begin()
 partSet = model.moduleDocument()

diff --git a/src/FeaturesPlugin/Test/TestBooleanCompSolids.py b/src/FeaturesPlugin/Test/TestBooleanCompSolids.py
index 8d997e60ecb747a8516bf6445d8e63da72d433b4..414498fb4b47828860aaa1e787b05fd37638c65c 100644 (file)
--- a/src/FeaturesPlugin/Test/TestBooleanCompSolids.py
+++ b/src/FeaturesPlugin/Test/TestBooleanCompSolids.py
@@ -129,5 +129,5 @@ assert (aBooleanResult is not None)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestBooleanFill.py b/src/FeaturesPlugin/Test/TestBooleanFill.py
index 6a29649ca0efcf0b9ec8fec4fc09d4b01b2ebfaf..8070321618439b7f0a53442ef7c990905125337c 100644 (file)
--- a/src/FeaturesPlugin/Test/TestBooleanFill.py
+++ b/src/FeaturesPlugin/Test/TestBooleanFill.py
@@ -4,7 +4,7 @@ Test case for Boolean Fill feature. Written on High API.
 from ModelAPI import *
 from GeomAPI import *
 
-import model
+from salome.shaper import model
 
 # Get session
 aSession = ModelAPI_Session.get()

diff --git a/src/FeaturesPlugin/Test/TestBooleanSmash.py b/src/FeaturesPlugin/Test/TestBooleanSmash.py
index 2190346cffbae2dedde442cbb757f9a8638a902f..02d0606c71c1a4477e42bb02a77393a33ee3ed51 100644 (file)
--- a/src/FeaturesPlugin/Test/TestBooleanSmash.py
+++ b/src/FeaturesPlugin/Test/TestBooleanSmash.py
@@ -103,5 +103,5 @@ assert (aBooleanResult is not None)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py b/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py
index 0e556e5fa0428faef7b0613fa4bd1b616003fd86..fceb782ff3c7ad881e575e1e6883a8523470927b 100644 (file)
--- a/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py
+++ b/src/FeaturesPlugin/Test/TestCompositeFeaturesOnCompSolids.py
@@ -225,5 +225,5 @@ assert (len(anRevolutionFuseFt.results()) > 0)
 aCurrentResult = modelAPI_ResultBody(anRevolutionFuseFt.firstResult())
 assert (aCurrentResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestExtrusion.py b/src/FeaturesPlugin/Test/TestExtrusion.py
index ea08653101f30fea67d00aea923fa2fa2bd51b52..527dafeacefc3de82bc6b86c340d20d30d50694d 100644 (file)
--- a/src/FeaturesPlugin/Test/TestExtrusion.py
+++ b/src/FeaturesPlugin/Test/TestExtrusion.py
@@ -246,5 +246,5 @@ assert (anExtrusionResult is not None)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestExtrusionCut.py b/src/FeaturesPlugin/Test/TestExtrusionCut.py
index 72a536f984dd4b3c654302f698ce960a437d0325..e461c50e1ae800cdbcb4bf22cdcfa2ed336ed6e9 100644 (file)
--- a/src/FeaturesPlugin/Test/TestExtrusionCut.py
+++ b/src/FeaturesPlugin/Test/TestExtrusionCut.py
@@ -118,5 +118,5 @@ assert (len(anExtrusionCutFt.results()) > 0)
 aCurrentResult = modelAPI_ResultBody(anExtrusionCutFt.firstResult())
 assert (aCurrentResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestExtrusionFuse.py b/src/FeaturesPlugin/Test/TestExtrusionFuse.py
index e57883994301b8bd3aea5339aa5de54784346dbc..12693b837380cb3a272c3c9f0993a832b0e8df25 100644 (file)
--- a/src/FeaturesPlugin/Test/TestExtrusionFuse.py
+++ b/src/FeaturesPlugin/Test/TestExtrusionFuse.py
@@ -118,5 +118,5 @@ assert (len(anExtrusionFuseFt.results()) > 0)
 aCurrentResult = modelAPI_ResultBody(anExtrusionFuseFt.firstResult())
 assert (aCurrentResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestIntersection.py b/src/FeaturesPlugin/Test/TestIntersection.py
index 2915cff8671449c280dc9e2de5216386a0b561e6..d1c0043a6ac44343e24bb4648b808fd6467c8007 100644 (file)
--- a/src/FeaturesPlugin/Test/TestIntersection.py
+++ b/src/FeaturesPlugin/Test/TestIntersection.py
@@ -147,5 +147,5 @@ assert (len(anIntersectionFt.results()) > 0)
 anItersectionResult = modelAPI_ResultBody(anIntersectionFt.firstResult())
 assert (anItersectionResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestMultiBoolean.py b/src/FeaturesPlugin/Test/TestMultiBoolean.py
index b6a6e742cba94fc89c79b54b69d1c992c258d0d4..aa36d86280812bc8b1492249212b0355ba9e5bee 100644 (file)
--- a/src/FeaturesPlugin/Test/TestMultiBoolean.py
+++ b/src/FeaturesPlugin/Test/TestMultiBoolean.py
@@ -193,5 +193,5 @@ aSession.finishOperation()
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestPartition.py b/src/FeaturesPlugin/Test/TestPartition.py
index dbc14ed948dbd49706de3997e97ee3d9f6f9cf84..127209b2afe39d574d799c26a68d4f8a92cade80 100644 (file)
--- a/src/FeaturesPlugin/Test/TestPartition.py
+++ b/src/FeaturesPlugin/Test/TestPartition.py
@@ -130,5 +130,5 @@ assert (len(aPartitionFt.results()) > 0)
 aPartitionResult = modelAPI_ResultBody(aPartitionFt.firstResult())
 assert (aPartitionResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestPipe.py b/src/FeaturesPlugin/Test/TestPipe.py
index 57e371274f72d9ad4360e3b80b38ebe731c54440..21ba065e16f3e837a3d868d11eb133b9c13bd609 100644 (file)
--- a/src/FeaturesPlugin/Test/TestPipe.py
+++ b/src/FeaturesPlugin/Test/TestPipe.py
@@ -164,5 +164,5 @@ aSession.finishOperation()
 # Test results
 assert (len(aPipeFeature.results()) > 0)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestPlacement.py b/src/FeaturesPlugin/Test/TestPlacement.py
index 24619f2173e747a6fa6d278d8d3e81e1a3ec771a..39249d1ad0a8a5ad4385bc3f16fff750822c73a9 100644 (file)
--- a/src/FeaturesPlugin/Test/TestPlacement.py
+++ b/src/FeaturesPlugin/Test/TestPlacement.py
@@ -218,5 +218,5 @@ assert (len(aPlacementFt.results()) > 0)
 aPlacementResult = modelAPI_ResultBody(aPlacementFt.firstResult())
 assert (aPlacementResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestRecover.py b/src/FeaturesPlugin/Test/TestRecover.py
index d591a56d6c6b174e4d765a6b0fc56a25d3c272a9..ab1251a562e136dd2d8089f83ccbcf05c639e958 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRecover.py
+++ b/src/FeaturesPlugin/Test/TestRecover.py
@@ -1,7 +1,7 @@
 # Test made with high level API
 # -----------------------------
 
-import model
+from salome.shaper import model
 
 # Initialisation
 

diff --git a/src/FeaturesPlugin/Test/TestRecover1798.py b/src/FeaturesPlugin/Test/TestRecover1798.py
index fafce818fc70407887a976affbf235453e2a580e..2e9a23b3de89adbb8927e4ac647d469c271f3a7e 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRecover1798.py
+++ b/src/FeaturesPlugin/Test/TestRecover1798.py
@@ -1,4 +1,4 @@
-import model
+from salome.shaper import model
 
 model.begin()
 partSet = model.moduleDocument()

diff --git a/src/FeaturesPlugin/Test/TestRemoveSubShapes.py b/src/FeaturesPlugin/Test/TestRemoveSubShapes.py
index 713e7e94e3bbc3bff8b12520ac553756ebffa4e6..6227d4580e65876a3943c2f4b173de96978d691b 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRemoveSubShapes.py
+++ b/src/FeaturesPlugin/Test/TestRemoveSubShapes.py
@@ -73,5 +73,5 @@ assert (len(aRemoveSubShapesFeature.results()) > 0)
 anUnionResult = modelAPI_ResultCompSolid(modelAPI_ResultBody(aRemoveSubShapesFeature.firstResult()))
 assert (anUnionResult.numberOfSubs() == 2)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestRevolution.py b/src/FeaturesPlugin/Test/TestRevolution.py
index cfac07013495388e06287617ebf342503e1c79a3..28aba7762db84a42c6900e2dc144cdf831923250 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRevolution.py
+++ b/src/FeaturesPlugin/Test/TestRevolution.py
@@ -207,5 +207,5 @@ assert (len(aRevolFt.results()) > 0)
 aRevolResult = modelAPI_ResultBody(aRevolFt.firstResult())
 assert (aRevolResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestRevolutionCut.py b/src/FeaturesPlugin/Test/TestRevolutionCut.py
index 6ec4eb3b584c37d659c5273b2745d5f96842e4df..c9b10c8feacfcd70a32a51922d6cb4cb741c27f9 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRevolutionCut.py
+++ b/src/FeaturesPlugin/Test/TestRevolutionCut.py
@@ -145,5 +145,5 @@ assert (len(anRevolutionCutFt.results()) > 0)
 aCurrentResult = modelAPI_ResultBody(anRevolutionCutFt.firstResult())
 assert (aCurrentResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestRevolutionFuse.py b/src/FeaturesPlugin/Test/TestRevolutionFuse.py
index 807a4d4430d57cf14fcd23e360ce14cabbade237..863d2a6d0d11affe61e3a4ddd181770d67ac45ed 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRevolutionFuse.py
+++ b/src/FeaturesPlugin/Test/TestRevolutionFuse.py
@@ -173,5 +173,5 @@ assert (len(anRevolutionFuseFt.results()) > 0)
 aCurrentResult = modelAPI_ResultBody(anRevolutionFuseFt.firstResult())
 assert (aCurrentResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestRotation.py b/src/FeaturesPlugin/Test/TestRotation.py
index 9cd1479c529c41cdf69117c0404122d11963e085..3b50fa66ce21d6cfada205a0d30a3af7c6085a7d 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRotation.py
+++ b/src/FeaturesPlugin/Test/TestRotation.py
@@ -132,5 +132,5 @@ assert (len(aRotateFt.results()) > 0)
 aMoveResult = modelAPI_ResultBody(aRotateFt.firstResult())
 assert (aMoveResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestSerialBoolean.py b/src/FeaturesPlugin/Test/TestSerialBoolean.py
index 9b248edcc789397da16b601d3b62dae1b05321fa..7adf336245fcb522d8d82f0cbd019ef3e15053d6 100644 (file)
--- a/src/FeaturesPlugin/Test/TestSerialBoolean.py
+++ b/src/FeaturesPlugin/Test/TestSerialBoolean.py
@@ -193,5 +193,5 @@ aSession.finishOperation()
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestTranslation.py b/src/FeaturesPlugin/Test/TestTranslation.py
index 59208b43c8b982a1bc33ea77201cc9968b4ca658..f6d95033d504cd45abab887b0d4fbce565d2572a 100644 (file)
--- a/src/FeaturesPlugin/Test/TestTranslation.py
+++ b/src/FeaturesPlugin/Test/TestTranslation.py
@@ -133,5 +133,5 @@ assert (len(aMoveFt.results()) > 0)
 aMoveResult = modelAPI_ResultBody(aMoveFt.firstResult())
 assert (aMoveResult is not None)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/FeaturesPlugin/Test/TestUnion.py b/src/FeaturesPlugin/Test/TestUnion.py
index eb4be902a064e7c82d03704e089b6d9414323f24..2b6f931ac779978cd7a84cc65bc5ed6cfdd43530 100644 (file)
--- a/src/FeaturesPlugin/Test/TestUnion.py
+++ b/src/FeaturesPlugin/Test/TestUnion.py
@@ -74,5 +74,5 @@ assert (len(aUnionFeature.results()) > 0)
 anUnionResult = modelAPI_ResultCompSolid(modelAPI_ResultBody(aUnionFeature.firstResult()))
 assert (anUnionResult.numberOfSubs() == 0)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelAPI/Test/Test1064.py b/src/ModelAPI/Test/Test1064.py
index 4f433271e34bc6ad4bb2f6d03df52ae7c8512509..f0af7ad980d981f0e51351c9eb70dede2c992d1e 100644 (file)
--- a/src/ModelAPI/Test/Test1064.py
+++ b/src/ModelAPI/Test/Test1064.py
@@ -106,5 +106,5 @@ assert(aPln.direction().z() == 0.)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelAPI/Test/Test1512.py b/src/ModelAPI/Test/Test1512.py
index 491061c9be2b6d83c838351296654d1e2c36171a..21fce85e8ec2b847e2b3629e71e88f5cc02ae7f8 100755 (executable)
--- a/src/ModelAPI/Test/Test1512.py
+++ b/src/ModelAPI/Test/Test1512.py
@@ -150,5 +150,5 @@ assert(aFuse.firstResult().shape().isConnectedTopology() == False)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelAPI/Test/Test1757.py b/src/ModelAPI/Test/Test1757.py
index ccd4b625e801f0a97d9757249a00f4b860aec017..c67c23339da35896c5c53e8d4f3cc8031ab0ea99 100644 (file)
--- a/src/ModelAPI/Test/Test1757.py
+++ b/src/ModelAPI/Test/Test1757.py
@@ -7,7 +7,7 @@
 
 """
 
-import model
+from salome.shaper import model
 
 #=========================================================================
 # Initialize a part

diff --git a/src/ModelAPI/Test/TestDocument.py b/src/ModelAPI/Test/TestDocument.py
index 7ff8a94505c6816b7c53ba99f7d49a111607695d..90bcf24cf7aa67670e4c34d8f9863792288db8b1 100644 (file)
--- a/src/ModelAPI/Test/TestDocument.py
+++ b/src/ModelAPI/Test/TestDocument.py
@@ -89,5 +89,5 @@ aSession.finishOperation()
 assert(aSession.moduleDocument().size("Parts") == 0)
 assert(aSession.activeDocument())
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelAPI/Test/TestResults.py b/src/ModelAPI/Test/TestResults.py
index b7e928d57d2d76372b39e2d03968b03303f7e51c..c7fa250be1be63fd4984aea0993046bc9f32fc5a 100755 (executable)
--- a/src/ModelAPI/Test/TestResults.py
+++ b/src/ModelAPI/Test/TestResults.py
@@ -41,5 +41,5 @@ assert(aColors.value(1) == 200)
 assert(aColors.value(2) == 250)
 aSession.finishOperation()
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelAPI/Test/TestUndoRedo.py b/src/ModelAPI/Test/TestUndoRedo.py
index db93001c300bb10faea43ccd67bf01ddff7d658f..d4748a02d82c7fc82e8612dab5d89cb29f400edd 100644 (file)
--- a/src/ModelAPI/Test/TestUndoRedo.py
+++ b/src/ModelAPI/Test/TestUndoRedo.py
@@ -33,5 +33,5 @@ assert(aDoc.size("Construction") == 8)
 assert(aSession.canUndo())
 assert(not aSession.canRedo())
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelGeomAlgo/Test/TestPoint2D.py b/src/ModelGeomAlgo/Test/TestPoint2D.py
index b43279ad5b058fb86d7dff8a86036e131cc5c7b4..6d5cf94b939eb4106134e9267aba767db7038ef6 100755 (executable)
--- a/src/ModelGeomAlgo/Test/TestPoint2D.py
+++ b/src/ModelGeomAlgo/Test/TestPoint2D.py
@@ -16,5 +16,5 @@ __updated__ = "2016-07-20"
 
 aSession = ModelAPI_Session.get()
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
index 1ea7a1f828e4610628a38eba8d95e4238f50a1f4..effc2d1d3af90857aa45264bd0aaa71c01062ca6 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
@@ -367,7 +367,7 @@ bool ModelHighAPI_Dumper::exportTo(const std::string& theFileName)
   if (!myModules.empty())
     aFile << std::endl;
 
-  aFile << "import model" << std::endl << std::endl;
+  aFile << "from salome.shaper import model" << std::endl << std::endl;
   aFile << "model.begin()" << std::endl;
 
   // dump collected data

diff --git a/src/ModelHighAPI/Test/TestDeflectionDump.py b/src/ModelHighAPI/Test/TestDeflectionDump.py
index 668f7c9e17fde59650f63bc4d2d139561871af83..d9dac2b06202bdd00e53026b22d7d193f6953e01 100644 (file)
--- a/src/ModelHighAPI/Test/TestDeflectionDump.py
+++ b/src/ModelHighAPI/Test/TestDeflectionDump.py
@@ -1,4 +1,4 @@
-import model
+from salome.shaper import model
 
 model.begin()
 partSet = model.moduleDocument()

diff --git a/src/ModelHighAPI/Test/TestRefAttr.py b/src/ModelHighAPI/Test/TestRefAttr.py
index a57ce922480d19e88d22c6fd0fa8a6c6ab2d44e2..2aa692e42839555b27550a5678146066fdf4575c 100644 (file)
--- a/src/ModelHighAPI/Test/TestRefAttr.py
+++ b/src/ModelHighAPI/Test/TestRefAttr.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 import ModelHighAPI
-import model
+from salome.shaper import model
 
 class FeaturesFixture(unittest.TestCase):
 

diff --git a/src/ModelHighAPI/Test/TestReference.py b/src/ModelHighAPI/Test/TestReference.py
index 136894e25dc238cdb124a56ec30301716709d20f..9abee983850fcb6ddb17e3cdb6acaeb44427b4f0 100644 (file)
--- a/src/ModelHighAPI/Test/TestReference.py
+++ b/src/ModelHighAPI/Test/TestReference.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 import ModelHighAPI
-import model
+from salome.shaper import model
 
 class FeaturesFixture(unittest.TestCase):
 

diff --git a/src/ParametersPlugin/Test/Test1806.py b/src/ParametersPlugin/Test/Test1806.py
index 096a9657bc12a294a9bd8fb70bb6762e607d71d1..2f478e8fa8f58a4d1ccc75d7bd0dd0534353d7a6 100644 (file)
--- a/src/ParametersPlugin/Test/Test1806.py
+++ b/src/ParametersPlugin/Test/Test1806.py
@@ -47,5 +47,5 @@ assert(aDistance.real("ConstraintValue").value() == 12.5)
 #=========================================================================
 # End of test
 #=========================================================================
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ParametersPlugin/Test/TestParameterChangeValue.py b/src/ParametersPlugin/Test/TestParameterChangeValue.py
index d9941dad112085e00d5ac943d495db508f3ea6c0..3d6d9e23056a22dd0bd9380a53dd3847a01beca3 100644 (file)
--- a/src/ParametersPlugin/Test/TestParameterChangeValue.py
+++ b/src/ParametersPlugin/Test/TestParameterChangeValue.py
@@ -23,7 +23,7 @@ from GeomDataAPI import *
 from ModelAPI import *
 import math
 import unittest
-import model
+from salome.shaper import model
 
 __updated__ = "2015-04-27"
 

diff --git a/src/ParametersPlugin/Test/TestParameterCreation.py b/src/ParametersPlugin/Test/TestParameterCreation.py
index e4ac3fee07f89eb09ef28aa5c07bfe1416029436..ad85bdf51cfe8464d2ceeb52713eacbf577d1abf 100644 (file)
--- a/src/ParametersPlugin/Test/TestParameterCreation.py
+++ b/src/ParametersPlugin/Test/TestParameterCreation.py
@@ -164,5 +164,5 @@ assert(aLengthAttr.value() == 250.)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/ParametersPlugin/Test/TestParameterRename.py b/src/ParametersPlugin/Test/TestParameterRename.py
index 10f854a3be8af3954767242f697a5327ee3dbee6..4141338293245ce6f1d9ab46b56727746a99f0e0 100644 (file)
--- a/src/ParametersPlugin/Test/TestParameterRename.py
+++ b/src/ParametersPlugin/Test/TestParameterRename.py
@@ -23,7 +23,7 @@ from GeomDataAPI import *
 from ModelAPI import *
 import math
 import unittest
-import model
+from salome.shaper import model
 
 __updated__ = "2015-04-27"
 

diff --git a/src/PartSetAPI/Test/TestRemoveDuplicate.py b/src/PartSetAPI/Test/TestRemoveDuplicate.py
index 466d310bff7003630ef7f2f4d946e0b3da28c76a..66523e08e8a2b3c4fdaf07c39793a01f18def136 100644 (file)
--- a/src/PartSetAPI/Test/TestRemoveDuplicate.py
+++ b/src/PartSetAPI/Test/TestRemoveDuplicate.py
@@ -1,7 +1,7 @@
 # Created a Part Remove/Duplicate API functionality since from low level and python dump it is not
 # tested: feature history infor is not stored.
 
-import model
+from salome.shaper import model
 
 # prepare axis created by PartSet and Part points
 model.begin()

diff --git a/src/PrimitivesPlugin/Test/TestBox.py b/src/PrimitivesPlugin/Test/TestBox.py
index 3caff58e0e246b57672e08aaa38bd5e52d17d2dc..08b2d9f273080af26876cc6cf81a27d581529724 100644 (file)
--- a/src/PrimitivesPlugin/Test/TestBox.py
+++ b/src/PrimitivesPlugin/Test/TestBox.py
@@ -5,7 +5,7 @@ Written on High API.
 from ModelAPI import *
 from GeomAPI import *
 
-import model
+from salome.shaper import model
 
 # Get session
 aSession = ModelAPI_Session.get()

diff --git a/src/PythonAPI/CMakeLists.txt b/src/PythonAPI/CMakeLists.txt
index a72cecb7fe607b9b43eec6020f2d1c3e922d359d..339fcc396912c3cd2881dea1780fcdf70e3d7d5b 100644 (file)
--- a/src/PythonAPI/CMakeLists.txt
+++ b/src/PythonAPI/CMakeLists.txt
@@ -1,7 +1,7 @@
 ## Copyright (C) 2014-20xx  OPEN CASCADE
 
 INSTALL(DIRECTORY geom model examples DESTINATION ${SHAPER_INSTALL_PYTHON_API})
-INSTALL(FILES shaper.py DESTINATION ${SHAPER_INSTALL_PYTHON_API})
+INSTALL(FILES __init__.py DESTINATION ${SHAPER_INSTALL_PYTHON_API})
 
 # --------- Unit tests -----------
 INCLUDE(UnitTest)

diff --git a/src/PythonAPI/Test/TestFeatures.py b/src/PythonAPI/Test/TestFeatures.py
index 549d6583b1929d8ff6475d66390d198953c1b15d..2354c151c35cdaf7ead2bf59645b7dcde588977b 100644 (file)
--- a/src/PythonAPI/Test/TestFeatures.py
+++ b/src/PythonAPI/Test/TestFeatures.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 
-import model
+from salome.shaper import model
 
 #-----------------------------------------------------------------------------
 # Fixtures

diff --git a/src/PythonAPI/Test/TestFeaturesExtrusion.py b/src/PythonAPI/Test/TestFeaturesExtrusion.py
index 54e4f3ccc36d68544bdd0a4534affb6e18fc92bf..b68759771abcf911759c4e755283faf0f8e9991f 100644 (file)
--- a/src/PythonAPI/Test/TestFeaturesExtrusion.py
+++ b/src/PythonAPI/Test/TestFeaturesExtrusion.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 
-import model
+from salome.shaper import model
 
 #-----------------------------------------------------------------------------
 # Fixtures

diff --git a/src/PythonAPI/Test/TestFeaturesRevolution.py b/src/PythonAPI/Test/TestFeaturesRevolution.py
index 90d9af9f6d3b08c4061ee3c966df2cb516ad495a..e0d2823c2f3ef3acdcb27df3bdbcec3a9dc42fb3 100644 (file)
--- a/src/PythonAPI/Test/TestFeaturesRevolution.py
+++ b/src/PythonAPI/Test/TestFeaturesRevolution.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 
-import model
+from salome.shaper import model
 
 #-----------------------------------------------------------------------------
 # Fixtures

diff --git a/src/PythonAPI/Test/TestMakeBrick1.py b/src/PythonAPI/Test/TestMakeBrick1.py
index 2225919c05415fdca0265c624dcb34d1d0ff324b..7c0c686d96c8b9bc668ec36ac2cc46483a2a407f 100644 (file)
--- a/src/PythonAPI/Test/TestMakeBrick1.py
+++ b/src/PythonAPI/Test/TestMakeBrick1.py
@@ -1,6 +1,6 @@
 import unittest
 
-import examples.MakeBrick1
+import salome.shaper.examples.MakeBrick1
 
 if __name__ == "__main__":
     unittest.main()

diff --git a/src/PythonAPI/Test/TestMakeBrick2.py b/src/PythonAPI/Test/TestMakeBrick2.py
index 21ea7263e5f9809df2ab9c0ce0079b1e0649655c..719b632f4e0f84d840b98893428e669342d51166 100644 (file)
--- a/src/PythonAPI/Test/TestMakeBrick2.py
+++ b/src/PythonAPI/Test/TestMakeBrick2.py
@@ -1,6 +1,6 @@
 import unittest
 
-import examples.MakeBrick2
+import salome.shaper.examples.MakeBrick2
 
 if __name__ == "__main__":
     unittest.main()

diff --git a/src/PythonAPI/Test/TestModel.py b/src/PythonAPI/Test/TestModel.py
index 0a204cf0bdbb02f195c4bfb56b0d505ae1fc1e9b..9a395563fa06cf917e4ba6b8cf2a8b11894d2b35 100644 (file)
--- a/src/PythonAPI/Test/TestModel.py
+++ b/src/PythonAPI/Test/TestModel.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 
 class ModelTestCase(unittest.TestCase):
     def setUp(self):

diff --git a/src/PythonAPI/Test/TestPlatine.py b/src/PythonAPI/Test/TestPlatine.py
index 498be77501683cfa97ca1fb3e0aa2528dde15671..1a879d8d6b11dea44c65195c64e9a28d97bb2032 100644 (file)
--- a/src/PythonAPI/Test/TestPlatine.py
+++ b/src/PythonAPI/Test/TestPlatine.py
@@ -1,6 +1,6 @@
 import unittest
 
-import examples.Platine
+import salome.shaper.examples.Platine
 
 if __name__ == "__main__":
     unittest.main()

diff --git a/src/PythonAPI/Test/TestPrimitivesBox.py b/src/PythonAPI/Test/TestPrimitivesBox.py
index 692a1c5027b217ead607a8113df023f79aa1c004..ba53513b5ac36957869024addf72836db43d0e2e 100644 (file)
--- a/src/PythonAPI/Test/TestPrimitivesBox.py
+++ b/src/PythonAPI/Test/TestPrimitivesBox.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 
-import model
+from salome.shaper import model
 
 class PrimitivesAddBox(unittest.TestCase):
 

diff --git a/src/PythonAPI/Test/TestPythonAPI.py b/src/PythonAPI/Test/TestPythonAPI.py
index e1fe337126846bd2846efecc4d9f2a6f2d0f4841..a175ed27a64c4cd87ca39ad9be44e155227095d3 100644 (file)
--- a/src/PythonAPI/Test/TestPythonAPI.py
+++ b/src/PythonAPI/Test/TestPythonAPI.py
@@ -1,6 +1,6 @@
 import unittest
-import model
-import geom
+from salome.shaper import model
+from salome.shaper import geom
 
 if __name__ == "__main__":
     unittest.main()

diff --git a/src/PythonAPI/Test/TestSketcher.py b/src/PythonAPI/Test/TestSketcher.py
index d41f7ddcf309dcfa4e1c48e9c628bd15bb11a959..443912b7f60b8ba81130800da4acf4c172c3f85d 100644 (file)
--- a/src/PythonAPI/Test/TestSketcher.py
+++ b/src/PythonAPI/Test/TestSketcher.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 
 # Delta value for almost equal comparisons
 DELTA = 1e-10

diff --git a/src/PythonAPI/Test/TestSketcherAddArc.py b/src/PythonAPI/Test/TestSketcherAddArc.py
index 551c4a880ce386b5a5799b90a094c68c275796d2..11e74e46d8bcf60798472086b0576e484a6d7d12 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherAddArc.py
+++ b/src/PythonAPI/Test/TestSketcherAddArc.py
@@ -1,7 +1,7 @@
 import unittest
 
-import model
-import geom
+from salome.shaper import model
+from salome.shaper import geom
 
 from TestSketcher import SketcherTestCase
 

diff --git a/src/PythonAPI/Test/TestSketcherAddCircle.py b/src/PythonAPI/Test/TestSketcherAddCircle.py
index 6b1c3399e44ab42bb503286bf3ebb7dad519b958..e1ed1fcfb59a456e919a68235a3da286239e36ab 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherAddCircle.py
+++ b/src/PythonAPI/Test/TestSketcherAddCircle.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherAddCircle(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherAddLine.py b/src/PythonAPI/Test/TestSketcherAddLine.py
index 25f53b3383d0388e596ed1e9b3a79af000d5021d..718dcdd7791e153e49fcdb3715a79dfa5808377c 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherAddLine.py
+++ b/src/PythonAPI/Test/TestSketcherAddLine.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherAddLine(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherAddMirror.py b/src/PythonAPI/Test/TestSketcherAddMirror.py
index e74b8ea3f1a22303da1ab817ad3d59d1a739230b..032bff2374ace8872a5ba954f81895e82bfa1b6f 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherAddMirror.py
+++ b/src/PythonAPI/Test/TestSketcherAddMirror.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 from ModelAPI import *
 from GeomDataAPI import geomDataAPI_Point2D

diff --git a/src/PythonAPI/Test/TestSketcherAddPoint.py b/src/PythonAPI/Test/TestSketcherAddPoint.py
index 8adf1574d2b9920470ca8bd980830b03e9070043..0a8086848627141f01e26e10a3bd3260da4b7ead 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherAddPoint.py
+++ b/src/PythonAPI/Test/TestSketcherAddPoint.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherAddPoint(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetAngle.py b/src/PythonAPI/Test/TestSketcherSetAngle.py
index 7dd937902441740da3f564336464adfbd7be047e..3ab267391e52e024bc7973ec4deb22bf1ebeddf9 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetAngle.py
+++ b/src/PythonAPI/Test/TestSketcherSetAngle.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 import math
 import TestSketcher
 from TestSketcher import SketcherTestCase

diff --git a/src/PythonAPI/Test/TestSketcherSetCoincident.py b/src/PythonAPI/Test/TestSketcherSetCoincident.py
index a964e59a942a17c695ba463b0ea69dba7f9020d7..4fe193ac6b75335692d3bfaaeacdedf0265ddd60 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetCoincident.py
+++ b/src/PythonAPI/Test/TestSketcherSetCoincident.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetCoincident(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetEqual.py b/src/PythonAPI/Test/TestSketcherSetEqual.py
index 9ffdb877454ca9cff4af5aa104cf8c1e38881412..b803cb74faef6fa62866942e2ae63f0ebf6a64a6 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetEqual.py
+++ b/src/PythonAPI/Test/TestSketcherSetEqual.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 import math
 import TestSketcher
 from TestSketcher import SketcherTestCase

diff --git a/src/PythonAPI/Test/TestSketcherSetFillet.py b/src/PythonAPI/Test/TestSketcherSetFillet.py
index 95b3d39981451ecc38dca5aa0cbfcde811f8e97f..f7e8260f0add2a7b030c47b60f816bb53107ef7d 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetFillet.py
+++ b/src/PythonAPI/Test/TestSketcherSetFillet.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetFillet(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetFixed.py b/src/PythonAPI/Test/TestSketcherSetFixed.py
index 87d3dee5ed407efdd3b7273032992113b5ea75f4..4d14738f2dda54f34bf227e36324f4407facf41e 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetFixed.py
+++ b/src/PythonAPI/Test/TestSketcherSetFixed.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetFixed(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetHorizontal.py b/src/PythonAPI/Test/TestSketcherSetHorizontal.py
index 68f23d35239befccaad9576426523648fa03f420..ecb3b4b67a321d4135eb4081e96eccf142449183 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetHorizontal.py
+++ b/src/PythonAPI/Test/TestSketcherSetHorizontal.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetHorizontal(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetLength.py b/src/PythonAPI/Test/TestSketcherSetLength.py
index 6a4997c80b931299af4844a154ae050ba3fa1b4f..fe005dae9ef36b13b6e164a57a302061f4371958 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetLength.py
+++ b/src/PythonAPI/Test/TestSketcherSetLength.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 import math
 import TestSketcher
 from TestSketcher import SketcherTestCase

diff --git a/src/PythonAPI/Test/TestSketcherSetParallel.py b/src/PythonAPI/Test/TestSketcherSetParallel.py
index 859773b01d7297187d17d457b589922d697eacf7..d70f6c893bb94f691cdcd240f6d871877c5786e4 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetParallel.py
+++ b/src/PythonAPI/Test/TestSketcherSetParallel.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetParallel(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetPerpendicular.py b/src/PythonAPI/Test/TestSketcherSetPerpendicular.py
index cc4e3e795cd0feca58b54c9432ccba39fce6256d..fe2bf7613299dec210c0e13edab801abb3e608f8 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetPerpendicular.py
+++ b/src/PythonAPI/Test/TestSketcherSetPerpendicular.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 import TestSketcher
 from TestSketcher import SketcherTestCase
 

diff --git a/src/PythonAPI/Test/TestSketcherSetRadius.py b/src/PythonAPI/Test/TestSketcherSetRadius.py
index d713ab7ae3b921d02fa097e96b8677f56dfb463a..f49a3db2b95012238b2d6932c140819df6998e7f 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetRadius.py
+++ b/src/PythonAPI/Test/TestSketcherSetRadius.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetRadius(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetTangent.py b/src/PythonAPI/Test/TestSketcherSetTangent.py
index f90f3e58eac0baa460770a37a2fe302ab4c84f29..b2464370d633c2db784c18bd250985bb7700583a 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetTangent.py
+++ b/src/PythonAPI/Test/TestSketcherSetTangent.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetTangent(SketcherTestCase):

diff --git a/src/PythonAPI/Test/TestSketcherSetVertical.py b/src/PythonAPI/Test/TestSketcherSetVertical.py
index 3a4be24888053336b4c22806f3e433594bbf69c7..e77fcbfa6b38c1573465ed266f9ee41c45815fa1 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetVertical.py
+++ b/src/PythonAPI/Test/TestSketcherSetVertical.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetVertical(SketcherTestCase):

diff --git a/src/PythonAPI/__init__.py b/src/PythonAPI/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/PythonAPI/doc/source/index.rst b/src/PythonAPI/doc/source/index.rst
index 8d06304bfd9119a2c9de7bf5d484df77e81f7d42..5140367bded9cac7d80db84167f6fa03f27c2184 100644 (file)
--- a/src/PythonAPI/doc/source/index.rst
+++ b/src/PythonAPI/doc/source/index.rst
@@ -19,7 +19,7 @@ with the parametric API will typically begin with a code like below:
 
 .. doctest:: 
 
-   >>> import model
+   >>> from salome.shaper import model
    >>> model.begin()
    >>> partset = model.moduleDocument()
    >>> part = model.addPart(partset).document()

diff --git a/src/PythonAPI/doc/source/model/extrusion.rst b/src/PythonAPI/doc/source/model/extrusion.rst
index 2f81a25c653d37c1d2c46a7ad49c7a60acf84da4..dce320d6df58ed08b06357c8d6ab8554bce4a72a 100644 (file)
--- a/src/PythonAPI/doc/source/model/extrusion.rst
+++ b/src/PythonAPI/doc/source/model/extrusion.rst
@@ -3,7 +3,7 @@ Extrusion
 
 .. testsetup::
 
-   import model
+   from salome.shaper import model
    model.begin()
    partset = model.moduleDocument()
    part = model.addPart(partset).document()

diff --git a/src/PythonAPI/examples/MakeBrick1.py b/src/PythonAPI/examples/MakeBrick1.py
index 6434488d4fb26325add62aa0eee421f4e396211a..3af36f89703ddeac7502c23b5d08185884435994 100644 (file)
--- a/src/PythonAPI/examples/MakeBrick1.py
+++ b/src/PythonAPI/examples/MakeBrick1.py
@@ -2,7 +2,7 @@
 # Author: Daniel Brunier-Coulin
 # -----------------------------
 
-import model
+from salome.shaper import model
 
 
 # Initialisation

diff --git a/src/PythonAPI/examples/MakeBrick2.py b/src/PythonAPI/examples/MakeBrick2.py
index 843773eebd0406e6a8c7b5dfea64fee6b1274e91..267cc692d2ebaed66173360060a0a9f30d276cb2 100644 (file)
--- a/src/PythonAPI/examples/MakeBrick2.py
+++ b/src/PythonAPI/examples/MakeBrick2.py
@@ -2,8 +2,8 @@
 # Author: Daniel Brunier-Coulin
 # -----------------------------
 
-import model
-import geom
+from salome.shaper import model
+from salome.shaper import geom
 
 
 # Initialisation

diff --git a/src/PythonAPI/examples/Platine.py b/src/PythonAPI/examples/Platine.py
index c4c9254e1f5d30ff0cf6e4d5b1f3b177a380acda..4813fa70254646f5c56552869b6b100222f3d7a0 100644 (file)
--- a/src/PythonAPI/examples/Platine.py
+++ b/src/PythonAPI/examples/Platine.py
@@ -2,8 +2,8 @@
 # Author: Sergey POKHODENKO
 # -----------------------------
 
-import geom
-import model
+from salome.shaper import geom
+from salome.shaper import model
 
 # START DEBUG PURPOSES
 # Should be removed

diff --git a/src/PythonAPI/shaper.py b/src/PythonAPI/shaper.py
deleted file mode 100644 (file)
index b2eb4d4..0000000
--- a/src/PythonAPI/shaper.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""This package defines the Python API of the Shaper.
-"""
-
-# Main packages
-
-import geom
-import model

diff --git a/src/PythonAddons/Test/TestRectangle.py b/src/PythonAddons/Test/TestRectangle.py
index 0efe470f613d034ed442f9e5254ff5525da96624..bfe45017bfebfb0201e262b122713a78cbcc3318 100644 (file)
--- a/src/PythonAddons/Test/TestRectangle.py
+++ b/src/PythonAddons/Test/TestRectangle.py
@@ -1,5 +1,5 @@
-import model
-import geom
+from salome.shaper import model
+from salome.shaper import geom
 
 model.begin()
 partSet = model.moduleDocument()

diff --git a/src/PythonAddons/macros/box/feature.py b/src/PythonAddons/macros/box/feature.py
index 18f4b24f6223444fa28cb66f78c4772ed64c7296..8c580cdc8b9c3e1d660103382eee6e30ced1aa48 100644 (file)
--- a/src/PythonAddons/macros/box/feature.py
+++ b/src/PythonAddons/macros/box/feature.py
@@ -3,8 +3,8 @@ Authors: Renaud Nedelec - Daniel Brunier-Coulin
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-import model
-import geom
+from salome.shaper import model
+from salome.shaper import geom
 
 
 class BoxFeature(model.Feature):

diff --git a/src/PythonAddons/macros/rectangle/feature.py b/src/PythonAddons/macros/rectangle/feature.py
index 3fa05afc18df8502ebd2f7da8ebb7d523afaab56..8a5cfa6b7ed363ac1507c07d5d77bab02ed0638f 100644 (file)
--- a/src/PythonAddons/macros/rectangle/feature.py
+++ b/src/PythonAddons/macros/rectangle/feature.py
@@ -4,7 +4,7 @@ Author: Artem ZHIDKOV
 Copyright (C) 2016-20xx CEA/DEN, EDF R&D
 """
 
-import model
+from salome.shaper import model
 import ModelAPI
 import GeomDataAPI
 

diff --git a/src/SketchPlugin/Test/TestConstraintAngle.py b/src/SketchPlugin/Test/TestConstraintAngle.py
index 3070252604dc486fe525174beb2565cb5dcd841a..83a3335464937a7833c6e31ed3464c9f2441d2c1 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintAngle.py
+++ b/src/SketchPlugin/Test/TestConstraintAngle.py
@@ -149,5 +149,5 @@ assert (angle(aSketchLineA, aSketchLineB) == NEW_ANGLE_DEGREE)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintCoincidence.py b/src/SketchPlugin/Test/TestConstraintCoincidence.py
index a1697920ead11a9e49aa7a23cd9ee787a464ad77..9bc2f2808425fc47fa617f20beb72d9f2d280652 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintCoincidence.py
+++ b/src/SketchPlugin/Test/TestConstraintCoincidence.py
@@ -210,5 +210,5 @@ assert (aCircleCenter.x() == 0. and aCircleCenter.y() == 0.)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintCollinear.py b/src/SketchPlugin/Test/TestConstraintCollinear.py
index b5d898273aec132fa44c00bc2f962227a66c8bd9..cb7e090ecec8447803b1c69e1aec14b63b2400b8 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintCollinear.py
+++ b/src/SketchPlugin/Test/TestConstraintCollinear.py
@@ -101,5 +101,5 @@ checkCollinear(aSketchLineA, aSketchLineB)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintDistance.py b/src/SketchPlugin/Test/TestConstraintDistance.py
index 38761a36d709b02f8518f1428998cbc328c58f7c..738bab161a07189322e31ed046b2f79152e5202d 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintDistance.py
+++ b/src/SketchPlugin/Test/TestConstraintDistance.py
@@ -186,5 +186,5 @@ assert (math.fabs(distancePointPoint(aLineAStartPoint, aLineAEndPoint) - PT_LINE
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintEqual.py b/src/SketchPlugin/Test/TestConstraintEqual.py
index 2d38a28f858a4388a4503c62fe6d7c94a595153f..e78dd6837a102712f047601b6cc5768a98e58e2c 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintEqual.py
+++ b/src/SketchPlugin/Test/TestConstraintEqual.py
@@ -201,5 +201,5 @@ assert (math.fabs(aLine2Len - anExtLineLen) < 1.e-10)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintHorizontal.py b/src/SketchPlugin/Test/TestConstraintHorizontal.py
index dc0b226d20b0d416ee5887f54e42c9eccd8ac875..f0a55dfe755d3a64368dee4776a3889f33b733aa 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintHorizontal.py
+++ b/src/SketchPlugin/Test/TestConstraintHorizontal.py
@@ -75,5 +75,5 @@ assert(aLineStartPoint.y() == aLineEndPoint.y())
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintLength.py b/src/SketchPlugin/Test/TestConstraintLength.py
index 72db4d76f7d3b14f3778c3e5c585fbe252b89f54..3d49d531734a91dfaf15e6d996cb03c36a95ff32 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintLength.py
+++ b/src/SketchPlugin/Test/TestConstraintLength.py
@@ -95,5 +95,5 @@ assert (math.fabs(aLineAEndPoint.x() - aLineAStartPoint.x() - 140) < 1.e-10)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintMiddlePoint.py b/src/SketchPlugin/Test/TestConstraintMiddlePoint.py
index 39db682204acc2f974bbd2faa3ce1afd90c97c50..ebda3620e860e8d14005e8912915043b6f643f57 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintMiddlePoint.py
+++ b/src/SketchPlugin/Test/TestConstraintMiddlePoint.py
@@ -141,5 +141,5 @@ assert (anOriginCoord.x() == 0. and anOriginCoord.y() == 0.)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintMirror.py b/src/SketchPlugin/Test/TestConstraintMirror.py
index 3f5ae69248744e5d9bac51e85bfac47c1119a748..f74af0803d5856bc6d51eeb47d06a37e3c0788d6 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintMirror.py
+++ b/src/SketchPlugin/Test/TestConstraintMirror.py
@@ -223,5 +223,5 @@ assert (aRefListB.size() == 1)
 assert (aRefListC.size() == 1)
 checkMirror(aRefListB, aRefListC, aMirrorLine)
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintParallel.py b/src/SketchPlugin/Test/TestConstraintParallel.py
index 076b2fc6277986ba1e1340c3a28b4e5a29c6cdb0..2dd6ce202acedd6c1608ce9ad27df7b984705d0f 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintParallel.py
+++ b/src/SketchPlugin/Test/TestConstraintParallel.py
@@ -109,5 +109,5 @@ assert (aLineBEndPointPrev != aLineBEndPointNew)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintPerpendicular.py b/src/SketchPlugin/Test/TestConstraintPerpendicular.py
index 42c2c98574efa659af17689816aea709311a86ad..f1d321362471c29050b8f5098e7e5d20ea726366 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintPerpendicular.py
+++ b/src/SketchPlugin/Test/TestConstraintPerpendicular.py
@@ -122,5 +122,5 @@ assert (aLineBEndPointPrev   != (aLineBEndPoint.x(),   aLineBEndPoint.y()))
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintRadius.py b/src/SketchPlugin/Test/TestConstraintRadius.py
index acef6c2f03287e8b8d00c7d72215fd9a610d8d6b..9513b01ea8810eea306d6838c366d356a14d46c2 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintRadius.py
+++ b/src/SketchPlugin/Test/TestConstraintRadius.py
@@ -151,5 +151,5 @@ assert (aCircleRadius.value() == 25)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintRigid.py b/src/SketchPlugin/Test/TestConstraintRigid.py
index 44f741503c445a26fd56fde77468a8af18133331..e3f43b51356811d2b84923f58d069b5f1dc5bff4 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintRigid.py
+++ b/src/SketchPlugin/Test/TestConstraintRigid.py
@@ -136,5 +136,5 @@ assert ((aLineCStartPoint.x(), aLineCStartPoint.y()) == (aLineBEndPoint.x(), aLi
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintTangent.py b/src/SketchPlugin/Test/TestConstraintTangent.py
index 24762159ff842198eddc5b244a3465dc5c5e6ac4..90d6cd8facb8b7e44bf960eef35b8daedfe21145 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintTangent.py
+++ b/src/SketchPlugin/Test/TestConstraintTangent.py
@@ -306,5 +306,5 @@ assert(math.fabs(distancePointLine(aCircleCenter, aLine) - round(aCircleRadius.v
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestConstraintVertical.py b/src/SketchPlugin/Test/TestConstraintVertical.py
index f70040248ee769213a09ddc33f15de5c412f7f73..8bbc541cd94b15fc4e32e04668dcfc36a0acee3b 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintVertical.py
+++ b/src/SketchPlugin/Test/TestConstraintVertical.py
@@ -75,5 +75,5 @@ assert(aLineStartPoint.x() == aLineEndPoint.x())
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestFillet.py b/src/SketchPlugin/Test/TestFillet.py
index 5b7bebb299b69bc36d8a83011de13677b8ff5ea1..e005bee4e65d41c73ed51e260055a55ea05e9fee 100644 (file)
--- a/src/SketchPlugin/Test/TestFillet.py
+++ b/src/SketchPlugin/Test/TestFillet.py
@@ -279,5 +279,5 @@ checkFillet(aResObjects, FILLET_RADIUS2)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestHighload.py b/src/SketchPlugin/Test/TestHighload.py
index 82075373941b56c8f5f03bbc14f4c920afbbd744..f78be7ff246eff69ab09cb889587920d697dc98c 100644 (file)
--- a/src/SketchPlugin/Test/TestHighload.py
+++ b/src/SketchPlugin/Test/TestHighload.py
@@ -121,5 +121,5 @@ aSession.finishOperation()
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestMultiRotation.py b/src/SketchPlugin/Test/TestMultiRotation.py
index 2afda371697834187d41e8c319458e9652672948..2a61103ec79195e7a2ce3d9560e5406ccba37380 100644 (file)
--- a/src/SketchPlugin/Test/TestMultiRotation.py
+++ b/src/SketchPlugin/Test/TestMultiRotation.py
@@ -220,5 +220,5 @@ checkRotation(aRotated, aNbCopies.value(), CENTER_X, CENTER_Y, ANGLE)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestMultiTranslation.py b/src/SketchPlugin/Test/TestMultiTranslation.py
index 0d3971e27e640289d955646ce9a345c258086c79..edb25d517e9aba7ed3d0b3b39f6fa3166f9f684b 100644 (file)
--- a/src/SketchPlugin/Test/TestMultiTranslation.py
+++ b/src/SketchPlugin/Test/TestMultiTranslation.py
@@ -211,5 +211,5 @@ checkTranslation(aTranslated, aNbCopies.value(), DELTA_X, DELTA_Y)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestProjection.py b/src/SketchPlugin/Test/TestProjection.py
index ee3151c430e805a7d029d7df1a85c1e3fcba54d6..45cc13a665b52734d8d0a85f9a3576977217fb12 100644 (file)
--- a/src/SketchPlugin/Test/TestProjection.py
+++ b/src/SketchPlugin/Test/TestProjection.py
@@ -126,5 +126,5 @@ assert(math.fabs(aProjLineEnd.y() - aLineEnd.y()) < 1.e-10)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestRectangle.py b/src/SketchPlugin/Test/TestRectangle.py
index b822c58d3c1cbf655907601f3afea7a38cbbcbe9..a2edbe9d37a49516bd9aa50daa8b6c47e7619d72 100644 (file)
--- a/src/SketchPlugin/Test/TestRectangle.py
+++ b/src/SketchPlugin/Test/TestRectangle.py
@@ -89,5 +89,5 @@ assert (aNbLines == 4)
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestSketchArcCircle.py b/src/SketchPlugin/Test/TestSketchArcCircle.py
index ed61f3fae28c84de90367df65fc08423bb4835f1..677de24e523be038dd8b17d27c8626809829dc00 100644 (file)
--- a/src/SketchPlugin/Test/TestSketchArcCircle.py
+++ b/src/SketchPlugin/Test/TestSketchArcCircle.py
@@ -244,5 +244,5 @@ aSession.finishOperation()
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestSketchPointLine.py b/src/SketchPlugin/Test/TestSketchPointLine.py
index f7880bf34108b227bbb1e2769fbe0956093f822e..0d3df2d144fe609d27155688dd93cdbba7b70482 100644 (file)
--- a/src/SketchPlugin/Test/TestSketchPointLine.py
+++ b/src/SketchPlugin/Test/TestSketchPointLine.py
@@ -95,5 +95,5 @@ aShape = aResultConstruction.shape()
 assert (aShape is not None)
 assert (not aShape.isNull())
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestSnowflake.py b/src/SketchPlugin/Test/TestSnowflake.py
index 3e8b9e0045c362cfb40271738b14698e9210aa29..dd2be72e79372010484ec39d8378c8392e83e53f 100644 (file)
--- a/src/SketchPlugin/Test/TestSnowflake.py
+++ b/src/SketchPlugin/Test/TestSnowflake.py
@@ -156,5 +156,5 @@ aSession.finishOperation()
 # End of test
 #=========================================================================
 
-import model
+from salome.shaper import model
 assert(model.checkPythonDump())

diff --git a/src/SketchPlugin/Test/TestSplit.py b/src/SketchPlugin/Test/TestSplit.py
index 82eacfbfd00aac5cb8fa2ff539b8e31f14187abb..addf8e46238693dc53b79917e7b2b2dacb756d17 100644 (file)
--- a/src/SketchPlugin/Test/TestSplit.py
+++ b/src/SketchPlugin/Test/TestSplit.py
@@ -1,4 +1,4 @@
-import model
+from salome.shaper import model
 
 from ModelAPI import *