From c1979ac5b44d02ed7b746ebb625d4cc1befa2ac2 Mon Sep 17 00:00:00 2001 From: SONOLET Aymeric Date: Thu, 21 Dec 2023 20:47:10 +0100 Subject: [PATCH] feat(format): Adding autoflake hook and apply it on all files This hook removes unused import statements, unused variables and useless pass statements. Used without the dangerous --remove-all-unused-imports option. --- .pre-commit-config.yaml | 5 +++++ correction_auto_2.py | 18 ++++++++++++++---- doc/gui/General/tutorial.py | 2 +- salome_pid.py | 2 +- scripts/doxy2swig.py | 3 +-- shaper_test.py | 4 ++-- src/BuildPlugin/Test/Test20469.py | 2 +- src/BuildPlugin/Test/Test20513_2.py | 2 +- src/BuildPlugin/Test/Test2415.py | 2 +- src/BuildPlugin/Test/Test2454.py | 2 +- src/BuildPlugin/Test/TestCompSolid.py | 2 +- src/BuildPlugin/Test/TestCompound_ErrorMsg.py | 2 +- src/BuildPlugin/Test/TestEdge_ErrorMsg.py | 2 +- src/BuildPlugin/Test/TestEdge_WholeSketch_1.py | 2 +- src/BuildPlugin/Test/TestEdge_WholeSketch_2.py | 2 +- src/BuildPlugin/Test/TestEdge_WholeSketch_3.py | 2 +- src/BuildPlugin/Test/TestEdge_WholeSketch_4.py | 2 +- src/BuildPlugin/Test/TestFace_WholeSketch_1.py | 2 +- src/BuildPlugin/Test/TestFace_WholeSketch_2.py | 2 +- src/BuildPlugin/Test/TestFilling_ErrorMsg.py | 2 +- .../Test/TestShell_WholeSketch_1.py | 2 +- .../Test/TestShell_WholeSketch_2.py | 2 +- src/BuildPlugin/Test/TestSolid.py | 2 +- src/BuildPlugin/Test/TestSolid_ErrorMsg.py | 2 +- src/BuildPlugin/Test/TestSubShapes_ErrorMsg.py | 2 +- src/BuildPlugin/Test/TestVertex_ErrorMsg.py | 2 +- .../Test/TestVertex_WholeSketch_1.py | 2 +- .../Test/TestVertex_WholeSketch_2.py | 2 +- src/BuildPlugin/Test/TestWire_ErrorMsg.py | 2 +- src/BuildPlugin/Test/TestWire_WholeSketch_1.py | 2 +- src/BuildPlugin/Test/TestWire_WholeSketch_2.py | 2 +- src/BuildPlugin/Test/TestWire_WholeSketch_3.py | 2 +- src/BuildPlugin/Test/TestWire_WholeSketch_4.py | 2 +- src/BuildPlugin/Test/TestWire_WholeSketch_5.py | 2 +- src/BuildPlugin/Test/TestWire_WholeSketch_6.py | 2 +- src/CollectionPlugin/Test/Test2977.py | 2 +- src/CollectionPlugin/Test/Test3031.py | 2 +- src/CollectionPlugin/Test/Test3114.py | 2 +- src/CollectionPlugin/Test/TestGroup1799.py | 2 +- src/CollectionPlugin/Test/TestGroupAddition.py | 2 +- .../Test/TestGroupIntersection.py | 2 +- src/CollectionPlugin/Test/TestGroupMove01.py | 2 +- src/CollectionPlugin/Test/TestGroupMove02.py | 2 +- src/CollectionPlugin/Test/TestGroupMove04.py | 2 +- src/CollectionPlugin/Test/TestGroupMove05.py | 2 +- src/CollectionPlugin/Test/TestGroupMove06.py | 2 +- src/CollectionPlugin/Test/TestGroupMove07.py | 2 +- src/CollectionPlugin/Test/TestGroupMove08.py | 2 +- src/CollectionPlugin/Test/TestGroupMove09.py | 2 +- src/CollectionPlugin/Test/TestGroupMove10.py | 2 +- src/CollectionPlugin/Test/TestGroupMove11.py | 2 +- src/CollectionPlugin/Test/TestGroupMove12.py | 2 +- src/CollectionPlugin/Test/TestGroupMove13.py | 2 +- src/CollectionPlugin/Test/TestGroupMove14.py | 2 +- src/CollectionPlugin/Test/TestGroupMove15.py | 2 +- src/CollectionPlugin/Test/TestGroupMove16.py | 2 +- src/CollectionPlugin/Test/TestGroupMove17.py | 2 +- src/CollectionPlugin/Test/TestGroupMove18.py | 2 +- src/CollectionPlugin/Test/TestGroupMove19.py | 2 +- src/CollectionPlugin/Test/TestGroupMove21.py | 2 +- src/CollectionPlugin/Test/TestGroupMove22.py | 2 +- src/CollectionPlugin/Test/TestGroupMove23.py | 2 +- src/CollectionPlugin/Test/TestGroupMove24.py | 2 +- src/CollectionPlugin/Test/TestGroupMove26.py | 2 +- .../Test/TestGroupMoveAndSplit2.py | 2 +- .../Test/TestGroupMoveAndSplit3.py | 2 +- src/CollectionPlugin/Test/TestGroupShape.py | 2 +- .../Test/TestGroupShareTopology.py | 2 +- .../Test/TestGroupSubstraction.py | 2 +- src/ConnectorAPI/Test/Test17917.py | 2 -- src/ConnectorAPI/Test/Test18887.py | 3 +-- src/ConnectorAPI/Test/Test2882.py | 4 +--- src/ConnectorAPI/Test/Test3195.py | 1 - src/ConnectorAPI/Test/TestExportSTL.py | 4 ++-- src/ConnectorAPI/Test/TestExportToGEOM.py | 11 ++++------- .../Test/TestExportToGEOMAllGroupsAndFields.py | 16 +++++----------- .../Test/TestExportToGEOMPartSet.py | 7 ++----- .../Test/TestExportToGEOMWholeFeature.py | 9 +++------ .../Test/TestExportToGEOMWholeResult.py | 11 ++++------- src/ConnectorAPI/Test/TestExportXAOMem.py | 5 ++--- src/ConnectorAPI/Test/TestImportSTEP.py | 1 - src/ConnectorAPI/Test/TestImportXAOMem.py | 6 ++---- src/ConnectorAPI/Test/testme.py | 5 ----- src/ConnectorPlugin/ConnectorPlugin.py | 1 - .../ConnectorPlugin_ExportFeature.py | 6 ------ .../ConnectorPlugin_PublishToStudyFeature.py | 3 +-- src/ConstructionAPI/Test/TestPoint.py | 2 +- src/ConstructionPlugin/Test/Test19207.py | 2 +- .../Test/TestAxisCreation.py | 1 - .../Test/TestAxis_ErrorMsg.py | 2 +- .../Test/TestPlane_ErrorMsg.py | 2 +- src/ConstructionPlugin/Test/TestPoint_34658.py | 3 +-- .../Test/TestPoint_ErrorMsg.py | 2 +- .../Test/TestPoint_IntersectLineAndPlane.py | 2 +- .../Test/TestPoint_IntersectPlanes.py | 2 +- .../Test/TestPoint_VertexSelection.py | 2 +- src/ConstructionPlugin/Test/UnitTestAxis.py | 1 - src/ExchangePlugin/Test/Test2290.py | 2 +- src/ExchangePlugin/Test/Test2459.py | 2 +- src/ExchangePlugin/Test/TestExport.py | 9 +++------ .../Test/TestExportPart_Failure_1.py | 2 +- .../Test/TestExportPart_Failure_2.py | 2 +- .../Test/TestExportPart_FullPartSet.py | 2 +- .../Test/TestExportPart_FullPart_1.py | 2 +- .../Test/TestExportPart_FullPart_2.py | 2 +- .../Test/TestExportPart_PartSet.py | 2 +- .../Test/TestExportPart_Results_1.py | 2 +- .../Test/TestExportPart_Results_2.py | 2 +- .../Test/TestExportPart_Results_3.py | 2 +- .../Test/TestExportPart_Results_4.py | 2 +- .../Test/TestExportPart_Results_5.py | 2 +- .../Test/TestExportPart_Results_6.py | 2 +- .../Test/TestExportPart_Results_7.py | 2 +- .../Test/TestExportPart_Results_8.py | 2 +- .../Test/TestExport_FiniteValidator.py | 2 +- src/ExchangePlugin/Test/TestImport.py | 4 ++-- src/ExchangePlugin/Test/TestImportImage_3.py | 2 +- .../Test/TestImportPart_Multiple.py | 1 - src/ExchangePlugin/Test/TestStep1.py | 2 +- src/ExchangePlugin/Test/testme.py | 5 ----- src/FeaturesPlugin/Test/Test17281.py | 2 +- src/FeaturesPlugin/Test/Test1876.py | 2 +- src/FeaturesPlugin/Test/Test18836.py | 2 +- src/FeaturesPlugin/Test/Test19065.py | 2 +- src/FeaturesPlugin/Test/Test19066.py | 2 +- src/FeaturesPlugin/Test/Test19115.py | 2 +- src/FeaturesPlugin/Test/Test1922.py | 2 +- src/FeaturesPlugin/Test/Test19931.py | 2 +- src/FeaturesPlugin/Test/Test20245_2.py | 2 +- src/FeaturesPlugin/Test/Test20247.py | 2 +- src/FeaturesPlugin/Test/Test2172.py | 2 +- src/FeaturesPlugin/Test/Test2197_1.py | 2 +- src/FeaturesPlugin/Test/Test2197_2.py | 2 +- src/FeaturesPlugin/Test/Test2197_3.py | 2 +- src/FeaturesPlugin/Test/Test2197_4.py | 2 +- src/FeaturesPlugin/Test/Test2222.py | 2 +- src/FeaturesPlugin/Test/Test2233.py | 2 +- src/FeaturesPlugin/Test/Test2240.py | 2 +- src/FeaturesPlugin/Test/Test2246.py | 2 +- src/FeaturesPlugin/Test/Test2248.py | 2 +- src/FeaturesPlugin/Test/Test2251.py | 2 +- src/FeaturesPlugin/Test/Test22847.py | 2 +- src/FeaturesPlugin/Test/Test2375.py | 2 +- src/FeaturesPlugin/Test/Test2465.py | 2 +- src/FeaturesPlugin/Test/Test2495.py | 2 +- src/FeaturesPlugin/Test/Test2514.py | 2 +- src/FeaturesPlugin/Test/Test2520.py | 2 +- src/FeaturesPlugin/Test/Test2588.py | 2 +- src/FeaturesPlugin/Test/Test2631.py | 2 +- src/FeaturesPlugin/Test/Test2686.py | 2 +- src/FeaturesPlugin/Test/Test2693.py | 2 +- src/FeaturesPlugin/Test/Test2698.py | 2 +- src/FeaturesPlugin/Test/Test2701.py | 2 +- src/FeaturesPlugin/Test/Test2724.py | 2 +- src/FeaturesPlugin/Test/Test2751.py | 2 +- src/FeaturesPlugin/Test/Test3033.py | 2 +- src/FeaturesPlugin/Test/Test3076.py | 2 +- src/FeaturesPlugin/Test/Test3137_1.py | 2 +- src/FeaturesPlugin/Test/Test3137_2.py | 2 +- src/FeaturesPlugin/Test/Test3139.py | 2 +- .../Test/TestBooleanCommon_ErrorMsg.py | 2 +- ...estBooleanCommon_MultiLevelCompound_v0_1.py | 2 +- ...estBooleanCommon_MultiLevelCompound_v0_2.py | 2 +- ...eanCommon_MultiLevelCompound_v20190506_1.py | 2 +- ...eanCommon_MultiLevelCompound_v20190506_2.py | 2 +- ...tBooleanCommon_WireCompound_WireCompound.py | 2 +- .../Test/TestBooleanCommon_Wire_Wire.py | 2 +- .../Test/TestBooleanCut_ErrorMsg.py | 2 +- .../TestBooleanCut_MultiLevelCompound_v0_1.py | 2 +- .../TestBooleanCut_MultiLevelCompound_v0_2.py | 2 +- ...ooleanCut_MultiLevelCompound_v20190506_1.py | 2 +- ...ooleanCut_MultiLevelCompound_v20190506_2.py | 2 +- .../Test/TestBooleanFuse_ErrorMsg.py | 2 +- .../TestBooleanFuse_MultiLevelCompound_v0_1.py | 2 +- .../TestBooleanFuse_MultiLevelCompound_v0_2.py | 2 +- .../TestBooleanFuse_MultiLevelCompound_v0_4.py | 2 +- ...oleanFuse_MultiLevelCompound_v20190506_1.py | 2 +- ...oleanFuse_MultiLevelCompound_v20190506_2.py | 2 +- ...oleanFuse_MultiLevelCompound_v20190506_4.py | 2 +- .../Test/TestBooleanSmash_ErrorMsg.py | 2 +- ...TestBooleanSmash_MultiLevelCompound_v0_1.py | 2 +- ...TestBooleanSmash_MultiLevelCompound_v0_2.py | 2 +- ...leanSmash_MultiLevelCompound_v20190506_1.py | 2 +- ...leanSmash_MultiLevelCompound_v20190506_2.py | 2 +- .../Test/TestBooleanSplit_ErrorMsg.py | 2 +- ...TestBooleanSplit_MultiLevelCompound_v0_1.py | 2 +- ...TestBooleanSplit_MultiLevelCompound_v0_2.py | 2 +- ...leanSplit_MultiLevelCompound_v20190506_1.py | 2 +- ...leanSplit_MultiLevelCompound_v20190506_2.py | 2 +- src/FeaturesPlugin/Test/TestBoundingBox.py | 1 - .../Test/TestCheckSharedFaces.py | 3 --- src/FeaturesPlugin/Test/TestCopyFeature.py | 2 +- .../Test/TestCopyFeatureMoveGroupOfFeature.py | 2 +- src/FeaturesPlugin/Test/TestCopyMoveResult.py | 2 +- .../Test/TestCopyMoveSubShapes.py | 2 +- .../Test/TestCopyWholeFeature.py | 2 +- src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py | 2 +- .../Test/TestDefeaturing_OnCompound.py | 2 +- .../Test/TestDefeaturing_OnCompsolid1.py | 2 +- .../Test/TestDefeaturing_OnCompsolid2.py | 2 +- .../Test/TestDefeaturing_OnSolid1.py | 2 +- .../Test/TestDefeaturing_OnSolid2.py | 2 +- .../Test/TestDefeaturing_OnSolid3.py | 2 +- src/FeaturesPlugin/Test/TestExtrusionCut.py | 1 - src/FeaturesPlugin/Test/TestExtrusionFuse.py | 1 - .../Test/TestExtrusion_ByFaces01.py | 2 +- .../Test/TestExtrusion_ByFaces02.py | 2 +- .../Test/TestExtrusion_ByFaces03.py | 2 +- .../Test/TestExtrusion_ByFaces04.py | 2 +- .../Test/TestExtrusion_ByFaces05.py | 2 +- .../Test/TestExtrusion_ByFaces06.py | 2 +- .../Test/TestExtrusion_ByFaces07.py | 2 +- .../Test/TestExtrusion_ByFaces08.py | 2 +- .../Test/TestExtrusion_ByFaces09.py | 2 +- .../Test/TestExtrusion_ByFaces10.py | 2 +- .../Test/TestExtrusion_ByFaces11.py | 2 +- .../Test/TestExtrusion_ByFaces12.py | 2 +- .../Test/TestExtrusion_ByFaces13.py | 2 +- .../Test/TestExtrusion_ByFaces14.py | 2 +- .../Test/TestExtrusion_ByFaces15.py | 2 +- .../Test/TestExtrusion_ByFaces16.py | 2 +- .../Test/TestExtrusion_ByFaces17.py | 2 +- .../Test/TestExtrusion_ByFaces18.py | 2 +- .../Test/TestExtrusion_ByFaces19.py | 2 +- .../Test/TestFillet1D_Vertices_1.py | 2 +- .../Test/TestFillet1D_Vertices_2.py | 2 +- .../Test/TestFillet1D_Vertices_3.py | 2 +- .../Test/TestFillet1D_Vertices_4.py | 2 +- .../Test/TestFillet1D_Vertices_5.py | 2 +- .../Test/TestFillet1D_Vertices_6.py | 2 +- .../Test/TestFillet1D_Vertices_7.py | 2 +- .../Test/TestFillet1D_Vertices_8.py | 2 +- .../Test/TestFillet1D_Vertices_9.py | 2 +- src/FeaturesPlugin/Test/TestFillet1D_Wire_1.py | 2 +- src/FeaturesPlugin/Test/TestFillet1D_Wire_2.py | 2 +- src/FeaturesPlugin/Test/TestFillet1D_Wire_3.py | 2 +- src/FeaturesPlugin/Test/TestFillet1D_Wire_4.py | 2 +- src/FeaturesPlugin/Test/TestFillet1D_Wire_5.py | 2 +- .../Test/TestFusionFaces32443.py | 2 +- .../Test/TestGeometryCalculation.py | 2 +- src/FeaturesPlugin/Test/TestIntersection.py | 1 - ...TestIntersection_MultiLevelCompound_v0_1.py | 2 +- ...TestIntersection_MultiLevelCompound_v0_2.py | 2 +- ...estIntersection_MultiLevelCompound_v95_1.py | 2 +- ...estIntersection_MultiLevelCompound_v95_2.py | 2 +- .../Test/TestMeasurementAngle.py | 2 +- .../Test/TestMeasurementAngle3Points.py | 2 +- .../Test/TestMultiRotation_ErrorMsg.py | 2 +- .../Test/TestMultiTranslation_ErrorMsg.py | 2 +- src/FeaturesPlugin/Test/TestNormalToFace.py | 5 +---- src/FeaturesPlugin/Test/TestPartition.py | 1 - .../Test/TestPartitionArgsUpdate.py | 2 +- .../Test/TestPartitionFace2Solid.py | 2 +- .../TestPartitionSubCompsolidWithCompSolid1.py | 2 +- .../TestPartitionSubCompsolidWithCompSolid2.py | 2 +- .../TestPartitionSubCompsolidWithCompSolid3.py | 2 +- .../Test/TestPartitionSubCompsolidWithFace1.py | 2 +- .../Test/TestPartitionSubCompsolidWithFace2.py | 2 +- .../Test/TestPartitionSubCompsolidWithFace3.py | 2 +- .../Test/TestPartitionSubCompsolidWithFace4.py | 2 +- .../Test/TestPartitionSubCompsolidWithFace5.py | 2 +- .../TestPartitionSubCompsolidWithPlane1.py | 2 +- .../TestPartitionSubCompsolidWithPlane2.py | 2 +- .../TestPartitionSubCompsolidWithPlane3.py | 2 +- .../TestPartitionSubCompsolidWithPlane4.py | 2 +- .../TestPartitionSubCompsolidWithPlane5.py | 2 +- .../TestPartitionSubCompsolidWithSolid1.py | 2 +- .../TestPartitionSubCompsolidWithSolid2.py | 2 +- .../TestPartitionSubCompsolidWithSolid3.py | 2 +- .../TestPartitionSubCompsolidWithSolid4.py | 2 +- .../TestPartitionSubCompsolidWithSolid5.py | 2 +- .../Test/TestPartition_ErrorMsg.py | 2 +- .../TestPartition_MultiLevelCompound_v0_1.py | 2 +- .../TestPartition_MultiLevelCompound_v0_2.py | 2 +- .../TestPartition_MultiLevelCompound_v0_3.py | 2 +- ...Partition_MultiLevelCompound_v20190506_1.py | 2 +- ...Partition_MultiLevelCompound_v20190506_2.py | 2 +- ...Partition_MultiLevelCompound_v20190506_3.py | 2 +- .../Test/TestPipe_DoNotMovePath.py | 2 +- .../Test/TestPlacement_Complex.py | 2 +- .../Test/TestPlacement_Edge_Edge.py | 1 - .../Test/TestPlacement_Edge_Vertex.py | 1 - .../Test/TestPlacement_ErrorMsg.py | 2 +- .../Test/TestPlacement_Face_Edge.py | 1 - .../Test/TestPlacement_Face_Face.py | 1 - .../Test/TestPlacement_Face_Vertex.py | 1 - .../TestPlacement_MultiLevelCompound_v0_5.py | 2 +- .../TestPlacement_MultiLevelCompound_v0_6.py | 2 +- .../TestPlacement_MultiLevelCompound_v95_5.py | 2 +- .../TestPlacement_MultiLevelCompound_v95_6.py | 2 +- src/FeaturesPlugin/Test/TestPointCloud.py | 2 +- .../Test/TestPointCoordinates.py | 2 +- .../Test/TestRemoveResultsBody.py | 2 +- .../Test/TestRemoveResultsConstruction.py | 2 +- .../Test/TestRemoveResultsPart.py | 2 +- src/FeaturesPlugin/Test/TestRemoveSubShapes.py | 1 - .../Test/TestRemoveSubShapes4.py | 2 +- .../Test/TestRemoveSubShapes5.py | 2 +- .../Test/TestRemoveSubShapes6.py | 2 +- src/FeaturesPlugin/Test/TestRevolution.py | 1 - src/FeaturesPlugin/Test/TestRevolutionCut.py | 1 - src/FeaturesPlugin/Test/TestRevolutionFuse.py | 1 - src/FeaturesPlugin/Test/TestRotation.py | 1 - .../Test/TestRotation_ErrorMsg.py | 2 +- .../TestRotation_MultiLevelCompound_v0_3.py | 2 +- .../TestRotation_MultiLevelCompound_v0_4.py | 2 +- .../TestRotation_MultiLevelCompound_v95_3.py | 2 +- .../TestRotation_MultiLevelCompound_v95_4.py | 2 +- .../Test/TestScale_MultiLevelCompound_v0_3.py | 2 +- .../Test/TestScale_MultiLevelCompound_v0_4.py | 2 +- .../Test/TestScale_MultiLevelCompound_v95_3.py | 2 +- .../Test/TestScale_MultiLevelCompound_v95_4.py | 2 +- src/FeaturesPlugin/Test/TestSewing_Groups.py | 3 +-- .../Test/TestSplitCompFaceSolid.py | 2 +- src/FeaturesPlugin/Test/TestSplitEdgeShell.py | 2 +- .../Test/TestSplitEdgeSolidIntersected.py | 2 +- src/FeaturesPlugin/Test/TestSplitEdgeVertex.py | 2 +- src/FeaturesPlugin/Test/TestSplitFaceShell.py | 2 +- src/FeaturesPlugin/Test/TestSplitFaceSolid.py | 2 +- .../Test/TestSplitShellConstrPlane.py | 2 +- src/FeaturesPlugin/Test/TestSplitShellEdge.py | 2 +- src/FeaturesPlugin/Test/TestSplitShellFace.py | 2 +- src/FeaturesPlugin/Test/TestSplitShellShell.py | 2 +- src/FeaturesPlugin/Test/TestSplitShellSolid.py | 2 +- .../Test/TestSplitShellVertex.py | 2 +- src/FeaturesPlugin/Test/TestSplitShellWire.py | 2 +- .../Test/TestSplitSolidCompFace.py | 2 +- .../Test/TestSplitSolidCompShell.py | 2 +- src/FeaturesPlugin/Test/TestSplitSolidFace.py | 2 +- src/FeaturesPlugin/Test/TestSplitSolidShell.py | 2 +- src/FeaturesPlugin/Test/TestSplitWireShell.py | 2 +- src/FeaturesPlugin/Test/TestSplitWireSolid.py | 2 +- src/FeaturesPlugin/Test/TestSplitWireVertex.py | 2 +- .../TestSymmetry_MultiLevelCompound_v0_4.py | 2 +- .../TestSymmetry_MultiLevelCompound_v0_5.py | 2 +- .../TestSymmetry_MultiLevelCompound_v95_1.py | 1 - .../TestSymmetry_MultiLevelCompound_v95_2.py | 1 - .../TestSymmetry_MultiLevelCompound_v95_3.py | 1 - .../TestSymmetry_MultiLevelCompound_v95_4.py | 2 +- .../TestSymmetry_MultiLevelCompound_v95_5.py | 2 +- src/FeaturesPlugin/Test/TestTranslation.py | 1 - .../TestTranslation_MultiLevelCompound_v0_4.py | 2 +- .../TestTranslation_MultiLevelCompound_v0_5.py | 2 +- ...TestTranslation_MultiLevelCompound_v95_4.py | 2 +- ...TestTranslation_MultiLevelCompound_v95_5.py | 2 +- src/FeaturesPlugin/Test/TestUnion.py | 1 - .../Test/TestUnion_MultiLevelCompound_v0.py | 2 +- .../TestUnion_MultiLevelCompound_v20190506.py | 2 +- .../doc/examples/check_shared_faces.py | 1 - .../doc/examples/create_bounding_box.py | 1 - .../doc/examples/create_normal_to_face.py | 1 - .../create_normal_to_face_at_vertex.py | 1 - src/FeaturesPlugin/doc/examples/fuse_faces.py | 2 +- .../doc/examples/geometry_calculation.py | 1 - src/FeaturesPlugin/doc/examples/pipe_simple.py | 2 +- .../doc/examples/point_coordinates.py | 1 - src/FiltersPlugin/Test/Test19190.py | 2 +- src/FiltersPlugin/Test/Test2946.py | 2 +- src/FiltersPlugin/Test/TestFilter_BelongsTo.py | 2 +- .../Test/TestFilter_BelongsTo_Exclude.py | 2 +- .../Test/TestFilter_ExternalFaces1.py | 2 +- .../Test/TestFilter_ExternalFaces_Exclude1.py | 2 +- .../Test/TestFilter_OnGeometry_Edge1.py | 2 +- .../TestFilter_OnGeometry_Exclude_Edge1.py | 2 +- .../TestFilter_OnGeometry_Exclude_Face1.py | 2 +- .../TestFilter_OnGeometry_Exclude_Face4.py | 2 +- .../Test/TestFilter_OnGeometry_Face1.py | 2 +- .../Test/TestFilter_OnGeometry_Face4.py | 2 +- .../TestFilter_OnPlaneSide_Exclude_Face.py | 2 +- .../TestFilter_OnPlaneSide_Exclude_Plane.py | 2 +- .../Test/TestFilter_OnPlaneSide_Face.py | 2 +- .../Test/TestFilter_OnPlaneSide_Plane.py | 2 +- .../Test/TestFilter_OppositeToEdge.py | 2 +- .../Test/TestFilter_OppositeToEdge_Exclude.py | 2 +- .../TestFilter_RelativeToSolid_Exclude_In.py | 2 +- ...stFilter_RelativeToSolid_Exclude_InAndOn.py | 2 +- ...TestFilter_RelativeToSolid_Exclude_NotOn.py | 2 +- .../TestFilter_RelativeToSolid_Exclude_On.py | 2 +- .../TestFilter_RelativeToSolid_Exclude_Out.py | 2 +- ...tFilter_RelativeToSolid_Exclude_OutAndOn.py | 2 +- .../Test/TestFilter_RelativeToSolid_In.py | 2 +- .../Test/TestFilter_RelativeToSolid_InAndOn.py | 2 +- .../Test/TestFilter_RelativeToSolid_NotOn.py | 2 +- .../Test/TestFilter_RelativeToSolid_On.py | 2 +- .../Test/TestFilter_RelativeToSolid_Out.py | 2 +- .../TestFilter_RelativeToSolid_OutAndOn.py | 2 +- .../TestFilter_TopoConnectedFaces_Edge1.py | 2 +- .../TestFilter_TopoConnectedFaces_Edge2.py | 2 +- .../TestFilter_TopoConnectedFaces_Edge3.py | 2 +- ...tFilter_TopoConnectedFaces_Exclude_Edge1.py | 2 +- ...tFilter_TopoConnectedFaces_Exclude_Edge2.py | 2 +- ...tFilter_TopoConnectedFaces_Exclude_Edge3.py | 2 +- ...tFilter_TopoConnectedFaces_Exclude_Face1.py | 2 +- ...tFilter_TopoConnectedFaces_Exclude_Face2.py | 2 +- ...tFilter_TopoConnectedFaces_Exclude_Face3.py | 2 +- ...ilter_TopoConnectedFaces_Exclude_Vertex1.py | 2 +- ...ilter_TopoConnectedFaces_Exclude_Vertex2.py | 2 +- ...ilter_TopoConnectedFaces_Exclude_Vertex3.py | 2 +- .../TestFilter_TopoConnectedFaces_Face1.py | 2 +- .../TestFilter_TopoConnectedFaces_Face2.py | 2 +- .../TestFilter_TopoConnectedFaces_Face3.py | 2 +- ...TestFilter_TopoConnectedFaces_Prop_Edge1.py | 2 +- ...TestFilter_TopoConnectedFaces_Prop_Edge2.py | 2 +- ...TestFilter_TopoConnectedFaces_Prop_Edge3.py | 2 +- ...er_TopoConnectedFaces_Prop_Exclude_Edge1.py | 2 +- ...er_TopoConnectedFaces_Prop_Exclude_Edge2.py | 2 +- ...er_TopoConnectedFaces_Prop_Exclude_Edge3.py | 2 +- ...er_TopoConnectedFaces_Prop_Exclude_Face1.py | 2 +- ...er_TopoConnectedFaces_Prop_Exclude_Face2.py | 2 +- ...er_TopoConnectedFaces_Prop_Exclude_Face3.py | 2 +- ..._TopoConnectedFaces_Prop_Exclude_Vertex1.py | 2 +- ..._TopoConnectedFaces_Prop_Exclude_Vertex2.py | 2 +- ..._TopoConnectedFaces_Prop_Exclude_Vertex3.py | 2 +- ...TestFilter_TopoConnectedFaces_Prop_Face1.py | 2 +- ...TestFilter_TopoConnectedFaces_Prop_Face2.py | 2 +- ...TestFilter_TopoConnectedFaces_Prop_Face3.py | 2 +- ...stFilter_TopoConnectedFaces_Prop_Vertex1.py | 2 +- ...stFilter_TopoConnectedFaces_Prop_Vertex2.py | 2 +- ...stFilter_TopoConnectedFaces_Prop_Vertex3.py | 2 +- .../TestFilter_TopoConnectedFaces_Vertex1.py | 2 +- .../TestFilter_TopoConnectedFaces_Vertex2.py | 2 +- .../TestFilter_TopoConnectedFaces_Vertex3.py | 2 +- src/FiltersPlugin/Test/TestFilters.py | 2 +- src/FiltersPlugin/Test/TestFilters_Mixed1.py | 2 +- src/FiltersPlugin/Test/TestFilters_Mixed2.py | 2 +- src/FiltersPlugin/Test/TestFilters_Remove.py | 2 +- src/GeomAPI/Test/Test2879.py | 2 +- src/GeomAPI/Test/TestAx123.py | 9 ++++++++- src/GeomAPI/Test/TestBuilders.py | 1 - src/GeomAPI/Test/TestEllipse2d.py | 3 +-- src/GeomAPI/Test/TestLine.py | 3 +-- src/GeomAPI/Test/TestPolygon.py | 1 - src/GeomDataAPI/Test/TestConstants.py | 2 +- src/Locale/Test/TestUTF8.py | 2 +- src/ModelAPI/Test/Test1562.py | 2 +- src/ModelAPI/Test/Test19217.py | 2 +- src/ModelAPI/Test/Test19707.py | 2 +- src/ModelAPI/Test/Test19726.py | 2 +- src/ModelAPI/Test/Test19932.py | 2 +- src/ModelAPI/Test/Test2170.py | 2 +- src/ModelAPI/Test/Test2228.py | 2 +- src/ModelAPI/Test/Test2241.py | 2 +- src/ModelAPI/Test/Test2413.py | 2 +- src/ModelAPI/Test/Test2491.py | 2 +- src/ModelAPI/Test/Test2510.py | 2 +- src/ModelAPI/Test/Test26745.py | 2 +- src/ModelAPI/Test/Test2685.py | 2 +- src/ModelAPI/Test/Test2873.py | 2 +- src/ModelAPI/Test/Test2903.py | 2 +- src/ModelAPI/Test/Test3020.py | 2 +- src/ModelAPI/Test/Test3116.py | 2 +- src/ModelAPI/Test/TestConstants.py | 9 ++++++++- src/ModelAPI/Test/TestCustomName_BooleanCut.py | 2 +- .../Test/TestCustomName_CutCompSolid.py | 2 +- src/ModelAPI/Test/TestCustomName_CutGroup.py | 2 +- src/ModelAPI/Test/TestFeatureSelection_2.py | 2 +- src/ModelAPI/Test/TestFolder_Sketch.py | 2 +- .../Test/TestGeomNamingEdgeByFilter.py | 2 +- src/ModelAPI/Test/TestGeomNamingSketchPlane.py | 2 +- src/ModelAPI/Test/TestResults.py | 2 +- src/ModelAPI/Test/TestSaveOpen1.py | 2 +- src/ModelAPI/Test/TestSaveOpen2.py | 8 +++++++- src/ModelAPI/Test/TestSelectionCircleCenter.py | 2 +- src/ModelAPI/Test/TestSelectionInPart.py | 2 +- .../Test/TestSelectionInitialization.py | 2 +- src/ModelAPI/Test/TestSelectionRestore.py | 2 +- src/ModelAPI/Test/TestSelectionScope.py | 2 +- src/ModelAPI/Test/TestWeakNaming2125.py | 2 +- src/ModelAPI/Test/TestWeakNaming2375.py | 2 +- src/ModelAPI/Test/TestWeakNamingSortOrder.py | 2 +- src/ModelHighAPI/Test/Test19990_1.py | 2 +- src/ModelHighAPI/Test/Test19990_2.py | 2 +- src/ModelHighAPI/Test/Test2488.py | 2 +- src/ModelHighAPI/Test/TestDouble.py | 6 +++--- src/ModelHighAPI/Test/TestInteger.py | 6 +++--- src/ParametersPlugin/Test/Test2392.py | 2 +- .../Test/TestParameterChangeValue.py | 1 - .../Test/TestParameterRename.py | 1 - src/ParametersPlugin/Test/TestParametersMgr.py | 2 +- src/PythonAPI/Test/TestFeaturesExtrusion.py | 14 +++++++------- src/PythonAPI/Test/TestFeaturesRevolution.py | 16 ++++++++-------- src/PythonAPI/Test/TestShapeInfo.py | 2 +- src/PythonAPI/Test/TestSketcherAddMirror.py | 4 +--- src/PythonAPI/examples/Platine.py | 1 - src/PythonAPI/model/dump/DumpAssistant.py | 3 +-- src/PythonAddons/Test/TestRectangleCentered.py | 2 +- src/PythonAddons/Test/TestcompoundVertices.py | 2 +- src/PythonAddons/Test/TestimportParameters.py | 2 +- src/PythonAddons/Test/TestmidSurface_1.py | 2 +- src/PythonAddons/Test/TestmidSurface_2.py | 2 +- src/PythonAddons/Test/TestpipeNetwork_2par2.py | 2 +- .../Test/TestpipeNetwork_parligne.py | 2 +- src/PythonAddons/addons_Features.py | 1 - src/PythonAddons/doc/examples/pipeNetwork.py | 2 +- .../macros/midSurface/midSurface_1.py | 2 +- .../macros/midSurface/midSurface_2.py | 2 +- src/PythonAddons/macros/pipeNetwork/feature.py | 2 +- src/SketchAPI/Test/TestFreePoints.py | 2 +- src/SketchAPI/Test/TestSketch.py | 2 +- src/SketchPlugin/Test/Test1673.py | 2 +- src/SketchPlugin/Test/Test19101.py | 2 +- src/SketchPlugin/Test/Test2018.py | 2 +- src/SketchPlugin/Test/Test2034_1.py | 2 +- src/SketchPlugin/Test/Test2034_3.py | 2 +- src/SketchPlugin/Test/Test2095.py | 2 +- src/SketchPlugin/Test/Test2115.py | 2 +- src/SketchPlugin/Test/Test2157_2.py | 2 +- src/SketchPlugin/Test/Test2229.py | 2 +- src/SketchPlugin/Test/Test2273.py | 2 +- src/SketchPlugin/Test/Test2341.py | 2 +- src/SketchPlugin/Test/Test2390.py | 2 +- src/SketchPlugin/Test/Test2393.py | 2 +- src/SketchPlugin/Test/Test2427.py | 2 +- src/SketchPlugin/Test/Test2440.py | 2 +- src/SketchPlugin/Test/Test2481.py | 2 +- src/SketchPlugin/Test/Test2654.py | 2 +- src/SketchPlugin/Test/Test2741.py | 2 +- src/SketchPlugin/Test/Test2860.py | 2 +- src/SketchPlugin/Test/Test2894.py | 2 +- src/SketchPlugin/Test/Test3132.py | 2 +- src/SketchPlugin/Test/Test3154.py | 2 +- src/SketchPlugin/Test/TestArcBehavior.py | 1 - src/SketchPlugin/Test/TestBSplineAddPole.py | 2 +- .../Test/TestChangeSketchPlane1.py | 2 +- .../Test/TestChangeSketchPlane2.py | 2 +- .../Test/TestChangeSketchPlane3.py | 2 +- .../TestConstraintAngleBehaviorBackward_1.py | 1 - .../TestConstraintAngleBehaviorBackward_2.py | 1 - .../Test/TestConstraintAngleBehaviorDirect.py | 1 - ...stConstraintAngleBehaviorSupplementary_1.py | 1 - ...stConstraintAngleBehaviorSupplementary_2.py | 1 - .../Test/TestConstraintAngle_v0_1.py | 2 +- .../Test/TestConstraintAngle_v0_2.py | 2 +- .../Test/TestConstraintAngle_v20191210_1.py | 2 +- .../Test/TestConstraintAngle_v20191210_2.py | 2 +- .../Test/TestConstraintCollinearEllipse.py | 1 - .../Test/TestConstraintDistanceBehavior.py | 2 +- .../TestConstraintDistanceHorizontalZero.py | 2 +- .../Test/TestConstraintDistanceVerticalZero.py | 2 +- .../Test/TestConstraintDistanceZero.py | 2 +- .../Test/TestConstraintHorizontalValidator.py | 3 +-- .../TestConstraintPerpendicularEllipseLine.py | 2 +- .../Test/TestConstraintTangentBSpline.py | 1 - .../Test/TestConstraintTangentEllipse.py | 1 - .../Test/TestCreateArcChangeType.py | 1 - .../Test/TestCreateCircleChangeType.py | 1 - src/SketchPlugin/Test/TestCreateEllipticArc.py | 4 ++-- .../Test/TestDistanceSignedVsUnsigned01.py | 2 +- .../Test/TestDistanceSignedVsUnsigned02.py | 2 +- .../Test/TestDistanceSignedVsUnsigned03.py | 2 +- .../Test/TestDistanceSignedVsUnsigned04.py | 2 +- .../Test/TestDistanceSignedVsUnsigned05.py | 2 +- .../Test/TestIntersectionChangeEdge.py | 2 +- src/SketchPlugin/Test/TestMoveEllipticArc.py | 2 +- src/SketchPlugin/Test/TestMoveLine.py | 6 +++--- src/SketchPlugin/Test/TestMovePoint.py | 2 +- src/SketchPlugin/Test/TestMultiRotation01.py | 2 +- src/SketchPlugin/Test/TestMultiRotation02.py | 2 +- src/SketchPlugin/Test/TestOffset1.py | 2 +- src/SketchPlugin/Test/TestOffset3.py | 2 +- src/SketchPlugin/Test/TestProjectionBSpline.py | 2 +- .../Test/TestProjectionBSplinePeriodic.py | 2 +- .../Test/TestProjectionIntoResult.py | 2 +- src/SketchPlugin/Test/TestRectangle1.py | 1 - src/SketchPlugin/Test/TestRemoveBSpline.py | 2 +- .../Test/TestRemoveBSplinePeriodic.py | 2 +- src/SketchPlugin/Test/TestRemoveEllipse.py | 2 +- src/SketchPlugin/Test/TestRemoveEllipticArc.py | 2 +- src/SketchPlugin/Test/TestSketchCopy01.py | 2 +- src/SketchPlugin/Test/TestSnowflake.py | 1 - src/SketchPlugin/Test/TestSplit.py | 7 ++++++- src/SketchPlugin/Test/TestTrimArc01.py | 1 - src/SketchPlugin/Test/TestTrimArc02.py | 1 - src/SketchPlugin/Test/TestTrimArc03.py | 1 - src/SketchPlugin/Test/TestTrimArc04.py | 1 - src/SketchPlugin/Test/TestTrimArc05.py | 1 - src/SketchPlugin/Test/TestTrimArc06.py | 1 - src/SketchPlugin/Test/TestTrimArc07.py | 1 - src/SketchPlugin/Test/TestTrimCircle01.py | 1 - src/SketchPlugin/Test/TestTrimCircle02.py | 1 - src/SketchPlugin/Test/TestTrimCircle03.py | 1 - src/SketchPlugin/Test/TestTrimCircle04.py | 1 - src/SketchPlugin/Test/TestTrimCircle05.py | 1 - .../Test/TestTrimCircleAndArc01.py | 1 - src/SketchPlugin/Test/TestTrimLine01.py | 1 - src/SketchPlugin/Test/TestTrimLine02.py | 1 - test.compatibility/bobine_film_reel.py | 2 +- test.compatibility/case24.py | 2 +- test.compatibility/ecran.py | 2 +- test.compatibility/piece_09.py | 2 +- test.compatibility/plug.py | 2 +- test.compatibility/sprocket.py | 2 +- test.hdfs/test_hdf.py | 11 +++++++---- test.hdfs/testme.py | 1 - test.models/bobine_film_reel.py | 2 +- test.models/case24.py | 2 +- test.models/ecran.py | 2 +- test.models/piece_09.py | 2 +- test.models/plug.py | 2 +- test.models/sprocket.py | 2 +- test.squish/shared/scripts/common.py | 1 - test.squish/suite_STANDALONE/tst_818/test.py | 2 -- 602 files changed, 616 insertions(+), 704 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 488820581..84aa35d20 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -67,3 +67,8 @@ repos: hooks: - id: cmake-format # - id: cmake-lint + - repo: https://github.com/PyCQA/autoflake + rev: v2.2.1 + hooks: + - id: autoflake + # args: [--remove-all-unused-imports, --in-place] # is dangerous !!! diff --git a/correction_auto_2.py b/correction_auto_2.py index 10af0b80a..abc9f021f 100644 --- a/correction_auto_2.py +++ b/correction_auto_2.py @@ -18,8 +18,20 @@ # -import os, os.path, sys, re, argparse -from utils import * +import os +import os.path +import re +import argparse +from utils import ( + ENCODING, + OPERATORS, + VERBOSE_FLAG, + create_warning_generator, + fic_readlines, + fic_writelines, + get_line_no, + get_src_path, +) #### définition des hooks. @@ -809,7 +821,6 @@ HOOKS_DICT = { "pattern_AND": "Extra space before )", }, extra_space_before_opening_paranthesis_in_function_call: { - "pattern": "whitespace/parens", "pattern": "Extra space before ( in function call", }, missing_space_before_opening_parenthesis_in_for: { @@ -962,7 +973,6 @@ def replace_fic_copyright(ficpath, warning=None): fic = open(get_src_path(ficpath), "r") liste = fic_readlines(fic) fic.close() - new_liste = [] if liste[0].find("/ Copyright (C) 2014-20xx CEA/DEN, EDF R&D\n\n") == -1: newliste = ["// Copyright (C) 2014-20xx CEA/DEN, EDF R&D\n\n"] + liste newliste = fic_writelines(newliste) diff --git a/doc/gui/General/tutorial.py b/doc/gui/General/tutorial.py index 154f481ce..7dd485fb7 100644 --- a/doc/gui/General/tutorial.py +++ b/doc/gui/General/tutorial.py @@ -1,4 +1,4 @@ -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/salome_pid.py b/salome_pid.py index bda690c95..f639c061d 100755 --- a/salome_pid.py +++ b/salome_pid.py @@ -20,7 +20,7 @@ # import sys, pickle -from killSalome import * +from killSalome import getPiDict process = sys.argv[2] # SALOME_Session_Server" diff --git a/scripts/doxy2swig.py b/scripts/doxy2swig.py index ba9e28d54..b1306143f 100755 --- a/scripts/doxy2swig.py +++ b/scripts/doxy2swig.py @@ -48,7 +48,6 @@ output will be written (the file will be clobbered). from xml.dom import minidom import re import textwrap -import sys import os.path import optparse @@ -743,7 +742,7 @@ class Doxy2SWIG: Do these even exist??? """ prot = node.attributes["prot"].value - id = node.attributes["id"].value + node.attributes["id"].value kind = node.attributes["kind"].value tmp = node.parentNode.parentNode.parentNode compdef = tmp.getElementsByTagName("compounddef")[0] diff --git a/shaper_test.py b/shaper_test.py index cefc7c1b6..48ec8010c 100644 --- a/shaper_test.py +++ b/shaper_test.py @@ -68,8 +68,8 @@ class TestShaper(unittest.TestCase): SketchConstraintPerpendicular_1 = Sketch_1.setPerpendicular( SketchLine_1.result(), SketchLine_2.result() ) - SketchConstraintRadius_1 = Sketch_1.setRadius(SketchArc_1.results()[1], 20) - SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_2.result()) + Sketch_1.setRadius(SketchArc_1.results()[1], 20) + Sketch_1.setVertical(SketchLine_2.result()) SketchProjection_1 = Sketch_1.addProjection( model.selection("VERTEX", "PartSet/Origin"), False ) diff --git a/src/BuildPlugin/Test/Test20469.py b/src/BuildPlugin/Test/Test20469.py index 131d294e1..f385e01e4 100644 --- a/src/BuildPlugin/Test/Test20469.py +++ b/src/BuildPlugin/Test/Test20469.py @@ -893,7 +893,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("COMPOUND", "Sketch_2")], Fa model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Wire_1, 2) model.testNbSubResults(Wire_1, [0, 0]) diff --git a/src/BuildPlugin/Test/Test20513_2.py b/src/BuildPlugin/Test/Test20513_2.py index 8630ebe14..5388bf1e7 100644 --- a/src/BuildPlugin/Test/Test20513_2.py +++ b/src/BuildPlugin/Test/Test20513_2.py @@ -1823,7 +1823,7 @@ Filling_3 = model.addFilling( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Filling_1, 1) model.testNbSubResults(Filling_1, [0]) diff --git a/src/BuildPlugin/Test/Test2415.py b/src/BuildPlugin/Test/Test2415.py index 2e36c5a83..846e00a1f 100644 --- a/src/BuildPlugin/Test/Test2415.py +++ b/src/BuildPlugin/Test/Test2415.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/BuildPlugin/Test/Test2454.py b/src/BuildPlugin/Test/Test2454.py index 2991d1f26..d97f063f0 100644 --- a/src/BuildPlugin/Test/Test2454.py +++ b/src/BuildPlugin/Test/Test2454.py @@ -40,7 +40,7 @@ Wire_2 = model.addWire(Part_1_doc, [model.selection("EDGE", "Extrusion_1_1/To_Ed Face_2 = model.addFace(Part_1_doc, [model.selection("WIRE", "Wire_2_1")]) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Face_2.feature()) diff --git a/src/BuildPlugin/Test/TestCompSolid.py b/src/BuildPlugin/Test/TestCompSolid.py index ccde74944..ecb3964cf 100644 --- a/src/BuildPlugin/Test/TestCompSolid.py +++ b/src/BuildPlugin/Test/TestCompSolid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/src/BuildPlugin/Test/TestCompound_ErrorMsg.py b/src/BuildPlugin/Test/TestCompound_ErrorMsg.py index f19b38b9f..52971c342 100644 --- a/src/BuildPlugin/Test/TestCompound_ErrorMsg.py +++ b/src/BuildPlugin/Test/TestCompound_ErrorMsg.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/BuildPlugin/Test/TestEdge_ErrorMsg.py b/src/BuildPlugin/Test/TestEdge_ErrorMsg.py index 16ad47edc..3360d3f47 100644 --- a/src/BuildPlugin/Test/TestEdge_ErrorMsg.py +++ b/src/BuildPlugin/Test/TestEdge_ErrorMsg.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/BuildPlugin/Test/TestEdge_WholeSketch_1.py b/src/BuildPlugin/Test/TestEdge_WholeSketch_1.py index 757a86d9f..8bf5838da 100644 --- a/src/BuildPlugin/Test/TestEdge_WholeSketch_1.py +++ b/src/BuildPlugin/Test/TestEdge_WholeSketch_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestEdge_WholeSketch_2.py b/src/BuildPlugin/Test/TestEdge_WholeSketch_2.py index d29101f20..e488088f8 100644 --- a/src/BuildPlugin/Test/TestEdge_WholeSketch_2.py +++ b/src/BuildPlugin/Test/TestEdge_WholeSketch_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestEdge_WholeSketch_3.py b/src/BuildPlugin/Test/TestEdge_WholeSketch_3.py index 73bc9fb73..546df3281 100644 --- a/src/BuildPlugin/Test/TestEdge_WholeSketch_3.py +++ b/src/BuildPlugin/Test/TestEdge_WholeSketch_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestEdge_WholeSketch_4.py b/src/BuildPlugin/Test/TestEdge_WholeSketch_4.py index 85558c0b9..d3c4c119f 100644 --- a/src/BuildPlugin/Test/TestEdge_WholeSketch_4.py +++ b/src/BuildPlugin/Test/TestEdge_WholeSketch_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestFace_WholeSketch_1.py b/src/BuildPlugin/Test/TestFace_WholeSketch_1.py index 9641b4bcd..e038974e1 100644 --- a/src/BuildPlugin/Test/TestFace_WholeSketch_1.py +++ b/src/BuildPlugin/Test/TestFace_WholeSketch_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestFace_WholeSketch_2.py b/src/BuildPlugin/Test/TestFace_WholeSketch_2.py index 456db769f..b45b837e5 100644 --- a/src/BuildPlugin/Test/TestFace_WholeSketch_2.py +++ b/src/BuildPlugin/Test/TestFace_WholeSketch_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestFilling_ErrorMsg.py b/src/BuildPlugin/Test/TestFilling_ErrorMsg.py index 37280c1cc..3f1b1d9e2 100644 --- a/src/BuildPlugin/Test/TestFilling_ErrorMsg.py +++ b/src/BuildPlugin/Test/TestFilling_ErrorMsg.py @@ -70,7 +70,7 @@ Part_1_doc.removeFeature(Filling_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session, featureToCompositeFeature aSession = ModelAPI_Session.get() diff --git a/src/BuildPlugin/Test/TestShell_WholeSketch_1.py b/src/BuildPlugin/Test/TestShell_WholeSketch_1.py index a3ab39155..6d6ef3661 100644 --- a/src/BuildPlugin/Test/TestShell_WholeSketch_1.py +++ b/src/BuildPlugin/Test/TestShell_WholeSketch_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestShell_WholeSketch_2.py b/src/BuildPlugin/Test/TestShell_WholeSketch_2.py index 0633dd16f..a73d7a605 100644 --- a/src/BuildPlugin/Test/TestShell_WholeSketch_2.py +++ b/src/BuildPlugin/Test/TestShell_WholeSketch_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestSolid.py b/src/BuildPlugin/Test/TestSolid.py index 5963b0aa1..95e1bdc91 100644 --- a/src/BuildPlugin/Test/TestSolid.py +++ b/src/BuildPlugin/Test/TestSolid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/BuildPlugin/Test/TestSolid_ErrorMsg.py b/src/BuildPlugin/Test/TestSolid_ErrorMsg.py index dc6bc0d9b..41105a862 100644 --- a/src/BuildPlugin/Test/TestSolid_ErrorMsg.py +++ b/src/BuildPlugin/Test/TestSolid_ErrorMsg.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/BuildPlugin/Test/TestSubShapes_ErrorMsg.py b/src/BuildPlugin/Test/TestSubShapes_ErrorMsg.py index b7ff70fab..6167cdf73 100644 --- a/src/BuildPlugin/Test/TestSubShapes_ErrorMsg.py +++ b/src/BuildPlugin/Test/TestSubShapes_ErrorMsg.py @@ -51,7 +51,7 @@ assert SubShapes_1.feature().error() == "" model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session, featureToCompositeFeature aSession = ModelAPI_Session.get() diff --git a/src/BuildPlugin/Test/TestVertex_ErrorMsg.py b/src/BuildPlugin/Test/TestVertex_ErrorMsg.py index 9f159c990..e9b8fe23c 100644 --- a/src/BuildPlugin/Test/TestVertex_ErrorMsg.py +++ b/src/BuildPlugin/Test/TestVertex_ErrorMsg.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/BuildPlugin/Test/TestVertex_WholeSketch_1.py b/src/BuildPlugin/Test/TestVertex_WholeSketch_1.py index d0c7a74e8..57d63ff00 100644 --- a/src/BuildPlugin/Test/TestVertex_WholeSketch_1.py +++ b/src/BuildPlugin/Test/TestVertex_WholeSketch_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestVertex_WholeSketch_2.py b/src/BuildPlugin/Test/TestVertex_WholeSketch_2.py index f56c9fd10..32bd8a399 100644 --- a/src/BuildPlugin/Test/TestVertex_WholeSketch_2.py +++ b/src/BuildPlugin/Test/TestVertex_WholeSketch_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestWire_ErrorMsg.py b/src/BuildPlugin/Test/TestWire_ErrorMsg.py index ba29b6de6..e3844ffce 100644 --- a/src/BuildPlugin/Test/TestWire_ErrorMsg.py +++ b/src/BuildPlugin/Test/TestWire_ErrorMsg.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/BuildPlugin/Test/TestWire_WholeSketch_1.py b/src/BuildPlugin/Test/TestWire_WholeSketch_1.py index 633ed7488..73747b9eb 100644 --- a/src/BuildPlugin/Test/TestWire_WholeSketch_1.py +++ b/src/BuildPlugin/Test/TestWire_WholeSketch_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestWire_WholeSketch_2.py b/src/BuildPlugin/Test/TestWire_WholeSketch_2.py index 76639b5a2..e06e18607 100644 --- a/src/BuildPlugin/Test/TestWire_WholeSketch_2.py +++ b/src/BuildPlugin/Test/TestWire_WholeSketch_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestWire_WholeSketch_3.py b/src/BuildPlugin/Test/TestWire_WholeSketch_3.py index d94f99239..989deecc6 100644 --- a/src/BuildPlugin/Test/TestWire_WholeSketch_3.py +++ b/src/BuildPlugin/Test/TestWire_WholeSketch_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestWire_WholeSketch_4.py b/src/BuildPlugin/Test/TestWire_WholeSketch_4.py index 4e00991b1..7baf15a01 100644 --- a/src/BuildPlugin/Test/TestWire_WholeSketch_4.py +++ b/src/BuildPlugin/Test/TestWire_WholeSketch_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestWire_WholeSketch_5.py b/src/BuildPlugin/Test/TestWire_WholeSketch_5.py index b53064a39..cc0619cc8 100644 --- a/src/BuildPlugin/Test/TestWire_WholeSketch_5.py +++ b/src/BuildPlugin/Test/TestWire_WholeSketch_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/BuildPlugin/Test/TestWire_WholeSketch_6.py b/src/BuildPlugin/Test/TestWire_WholeSketch_6.py index e6405209f..84a9da43e 100644 --- a/src/BuildPlugin/Test/TestWire_WholeSketch_6.py +++ b/src/BuildPlugin/Test/TestWire_WholeSketch_6.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/Test2977.py b/src/CollectionPlugin/Test/Test2977.py index 6c00b2156..6dd3a60d5 100644 --- a/src/CollectionPlugin/Test/Test2977.py +++ b/src/CollectionPlugin/Test/Test2977.py @@ -44,7 +44,7 @@ GroupSubstraction_1 = model.addGroupSubstraction( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(GroupSubstraction_1, 1) model.testNbSubResults(GroupSubstraction_1, [0]) diff --git a/src/CollectionPlugin/Test/Test3031.py b/src/CollectionPlugin/Test/Test3031.py index 1636aba59..09bb32b42 100644 --- a/src/CollectionPlugin/Test/Test3031.py +++ b/src/CollectionPlugin/Test/Test3031.py @@ -19,7 +19,7 @@ # Test of movement of the group of whole result with different results shape types: only one shape type must be in the moved group from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/Test3114.py b/src/CollectionPlugin/Test/Test3114.py index 54a66bb6a..ee6871c94 100644 --- a/src/CollectionPlugin/Test/Test3114.py +++ b/src/CollectionPlugin/Test/Test3114.py @@ -121,7 +121,7 @@ model.end() assert Part_1_doc.size("Groups") == 3 # equal to the number of original groups # check names of results -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() for group in [Group_3, Group_5, Group_6]: diff --git a/src/CollectionPlugin/Test/TestGroup1799.py b/src/CollectionPlugin/Test/TestGroup1799.py index f76d43cb7..160b5fff2 100644 --- a/src/CollectionPlugin/Test/TestGroup1799.py +++ b/src/CollectionPlugin/Test/TestGroup1799.py @@ -23,7 +23,7 @@ # The biggest part of the code is python dump of the updated_for_1799.hdf file from this issue. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupAddition.py b/src/CollectionPlugin/Test/TestGroupAddition.py index 837b363bf..2fe01ab6a 100644 --- a/src/CollectionPlugin/Test/TestGroupAddition.py +++ b/src/CollectionPlugin/Test/TestGroupAddition.py @@ -38,7 +38,7 @@ GroupAddition_1 = model.addGroupAddition( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(GroupAddition_1, 1) model.testNbSubResults(GroupAddition_1, [0]) diff --git a/src/CollectionPlugin/Test/TestGroupIntersection.py b/src/CollectionPlugin/Test/TestGroupIntersection.py index 51b9aa34f..42f639373 100644 --- a/src/CollectionPlugin/Test/TestGroupIntersection.py +++ b/src/CollectionPlugin/Test/TestGroupIntersection.py @@ -48,7 +48,7 @@ GroupIntersection_1 = model.addGroupIntersection( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(GroupIntersection_1, 1) model.testNbSubResults(GroupIntersection_1, [0]) diff --git a/src/CollectionPlugin/Test/TestGroupMove01.py b/src/CollectionPlugin/Test/TestGroupMove01.py index d08620a1b..0245a90d3 100644 --- a/src/CollectionPlugin/Test/TestGroupMove01.py +++ b/src/CollectionPlugin/Test/TestGroupMove01.py @@ -21,7 +21,7 @@ # group with not-touched vertex keeps this vertex. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove02.py b/src/CollectionPlugin/Test/TestGroupMove02.py index 2ee58b7b2..08ef22cea 100644 --- a/src/CollectionPlugin/Test/TestGroupMove02.py +++ b/src/CollectionPlugin/Test/TestGroupMove02.py @@ -20,7 +20,7 @@ # Test that removed vertex, selected in the group makes empty group => invalid one from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove04.py b/src/CollectionPlugin/Test/TestGroupMove04.py index fc346cf97..bd8705a0a 100644 --- a/src/CollectionPlugin/Test/TestGroupMove04.py +++ b/src/CollectionPlugin/Test/TestGroupMove04.py @@ -23,7 +23,7 @@ # results, but divided. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove05.py b/src/CollectionPlugin/Test/TestGroupMove05.py index e830a36a6..51f318cc4 100644 --- a/src/CollectionPlugin/Test/TestGroupMove05.py +++ b/src/CollectionPlugin/Test/TestGroupMove05.py @@ -67,7 +67,7 @@ Part_1_doc.moveFeature(Group_2.feature(), Group_1.feature()) Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() # check group 1: all solids in compound should be selected diff --git a/src/CollectionPlugin/Test/TestGroupMove06.py b/src/CollectionPlugin/Test/TestGroupMove06.py index 41d9479fc..682915db2 100644 --- a/src/CollectionPlugin/Test/TestGroupMove06.py +++ b/src/CollectionPlugin/Test/TestGroupMove06.py @@ -183,7 +183,7 @@ Part_1_doc.moveFeature(Group_5.feature(), Group_4.feature()) Part_1_doc.moveFeature(Group_6.feature(), Group_5.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove07.py b/src/CollectionPlugin/Test/TestGroupMove07.py index 366a7d8d6..443a22a80 100644 --- a/src/CollectionPlugin/Test/TestGroupMove07.py +++ b/src/CollectionPlugin/Test/TestGroupMove07.py @@ -66,7 +66,7 @@ Part_1_doc.moveFeature(Group_2.feature(), Group_1.feature()) Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() # check group 1: solids should be selected diff --git a/src/CollectionPlugin/Test/TestGroupMove08.py b/src/CollectionPlugin/Test/TestGroupMove08.py index f6abc8a3d..ef257fd53 100644 --- a/src/CollectionPlugin/Test/TestGroupMove08.py +++ b/src/CollectionPlugin/Test/TestGroupMove08.py @@ -86,7 +86,7 @@ Part_1_doc.moveFeature(Group_2.feature(), Group_1.feature()) Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove09.py b/src/CollectionPlugin/Test/TestGroupMove09.py index af14525e0..f0699b27c 100644 --- a/src/CollectionPlugin/Test/TestGroupMove09.py +++ b/src/CollectionPlugin/Test/TestGroupMove09.py @@ -195,7 +195,7 @@ Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) Part_1_doc.moveFeature(Group_4.feature(), Group_3.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove10.py b/src/CollectionPlugin/Test/TestGroupMove10.py index eb6c0ac9f..c9e576beb 100644 --- a/src/CollectionPlugin/Test/TestGroupMove10.py +++ b/src/CollectionPlugin/Test/TestGroupMove10.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove11.py b/src/CollectionPlugin/Test/TestGroupMove11.py index 4b457e4aa..ca2937c44 100644 --- a/src/CollectionPlugin/Test/TestGroupMove11.py +++ b/src/CollectionPlugin/Test/TestGroupMove11.py @@ -269,7 +269,7 @@ Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) Part_1_doc.moveFeature(Group_4.feature(), Group_3.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove12.py b/src/CollectionPlugin/Test/TestGroupMove12.py index 1f108a48a..e3de48728 100644 --- a/src/CollectionPlugin/Test/TestGroupMove12.py +++ b/src/CollectionPlugin/Test/TestGroupMove12.py @@ -22,7 +22,7 @@ # results, but divided. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove13.py b/src/CollectionPlugin/Test/TestGroupMove13.py index cd74d3832..008524cae 100644 --- a/src/CollectionPlugin/Test/TestGroupMove13.py +++ b/src/CollectionPlugin/Test/TestGroupMove13.py @@ -22,7 +22,7 @@ # results, but divided. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove14.py b/src/CollectionPlugin/Test/TestGroupMove14.py index 9b18786a0..92ea43820 100644 --- a/src/CollectionPlugin/Test/TestGroupMove14.py +++ b/src/CollectionPlugin/Test/TestGroupMove14.py @@ -22,7 +22,7 @@ # results, but divided. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove15.py b/src/CollectionPlugin/Test/TestGroupMove15.py index acb5c9b07..68286f93d 100644 --- a/src/CollectionPlugin/Test/TestGroupMove15.py +++ b/src/CollectionPlugin/Test/TestGroupMove15.py @@ -22,7 +22,7 @@ # results, but divided. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove16.py b/src/CollectionPlugin/Test/TestGroupMove16.py index 6fd2f7618..00fc9dd26 100644 --- a/src/CollectionPlugin/Test/TestGroupMove16.py +++ b/src/CollectionPlugin/Test/TestGroupMove16.py @@ -21,7 +21,7 @@ # Check the initial groups moved to the end contain the corresponding results. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove17.py b/src/CollectionPlugin/Test/TestGroupMove17.py index 9e1793921..36a970ab0 100644 --- a/src/CollectionPlugin/Test/TestGroupMove17.py +++ b/src/CollectionPlugin/Test/TestGroupMove17.py @@ -21,7 +21,7 @@ # Check the initial groups moved to the end contain the corresponding results. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove18.py b/src/CollectionPlugin/Test/TestGroupMove18.py index 46d20650c..0a0a62539 100644 --- a/src/CollectionPlugin/Test/TestGroupMove18.py +++ b/src/CollectionPlugin/Test/TestGroupMove18.py @@ -21,7 +21,7 @@ # Check the initial groups moved to the end contain the corresponding results. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove19.py b/src/CollectionPlugin/Test/TestGroupMove19.py index 5ec791bea..f45d81670 100644 --- a/src/CollectionPlugin/Test/TestGroupMove19.py +++ b/src/CollectionPlugin/Test/TestGroupMove19.py @@ -21,7 +21,7 @@ # Check the initial groups moved to the end contain the corresponding results. from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() diff --git a/src/CollectionPlugin/Test/TestGroupMove21.py b/src/CollectionPlugin/Test/TestGroupMove21.py index c63ce2b5b..943980f7e 100644 --- a/src/CollectionPlugin/Test/TestGroupMove21.py +++ b/src/CollectionPlugin/Test/TestGroupMove21.py @@ -20,7 +20,7 @@ # Test move the group in history for selection of a whole result from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove22.py b/src/CollectionPlugin/Test/TestGroupMove22.py index f9492cc27..c38f62c23 100644 --- a/src/CollectionPlugin/Test/TestGroupMove22.py +++ b/src/CollectionPlugin/Test/TestGroupMove22.py @@ -20,7 +20,7 @@ # Test move the group in history for selection of a whole result of a compsolid from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove23.py b/src/CollectionPlugin/Test/TestGroupMove23.py index 709024e73..4df29869e 100644 --- a/src/CollectionPlugin/Test/TestGroupMove23.py +++ b/src/CollectionPlugin/Test/TestGroupMove23.py @@ -20,7 +20,7 @@ # Test move the group in history for selection of a whole feature from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove24.py b/src/CollectionPlugin/Test/TestGroupMove24.py index 23cc04015..b04a6a4e4 100644 --- a/src/CollectionPlugin/Test/TestGroupMove24.py +++ b/src/CollectionPlugin/Test/TestGroupMove24.py @@ -20,7 +20,7 @@ # Test move the group in history for selection of a whole feature that produces compsolid from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMove26.py b/src/CollectionPlugin/Test/TestGroupMove26.py index 48f08d6c3..fafcedc82 100644 --- a/src/CollectionPlugin/Test/TestGroupMove26.py +++ b/src/CollectionPlugin/Test/TestGroupMove26.py @@ -21,7 +21,7 @@ # and don't treated like that by the move to the history algorithm from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/CollectionPlugin/Test/TestGroupMoveAndSplit2.py b/src/CollectionPlugin/Test/TestGroupMoveAndSplit2.py index 9cb9f0710..5f225c9a6 100644 --- a/src/CollectionPlugin/Test/TestGroupMoveAndSplit2.py +++ b/src/CollectionPlugin/Test/TestGroupMoveAndSplit2.py @@ -19,7 +19,7 @@ # Check the movement to the end and split: move to intermediate position, no duplicates appeared -from SketchAPI import * +from SketchAPI import SketchAPI_Arc from salome.shaper import model diff --git a/src/CollectionPlugin/Test/TestGroupMoveAndSplit3.py b/src/CollectionPlugin/Test/TestGroupMoveAndSplit3.py index 49f9416f4..9ece6ce5a 100644 --- a/src/CollectionPlugin/Test/TestGroupMoveAndSplit3.py +++ b/src/CollectionPlugin/Test/TestGroupMoveAndSplit3.py @@ -128,7 +128,7 @@ assert ( ) # 2 results because initially 2 results were selected # check names of results -from ModelAPI import * +from ModelAPI import modelAPI_Result res1 = modelAPI_Result(Part_1_doc.object("Groups", 0)) assert res1.data().name() == "GroupResult_1" diff --git a/src/CollectionPlugin/Test/TestGroupShape.py b/src/CollectionPlugin/Test/TestGroupShape.py index 9eebd717f..88a52b392 100644 --- a/src/CollectionPlugin/Test/TestGroupShape.py +++ b/src/CollectionPlugin/Test/TestGroupShape.py @@ -38,7 +38,7 @@ GroupShape_1 = model.addGroupShape( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(GroupShape_1, 1) model.testNbSubShapes(GroupShape_1, GeomAPI_Shape.SOLID, [0]) diff --git a/src/CollectionPlugin/Test/TestGroupShareTopology.py b/src/CollectionPlugin/Test/TestGroupShareTopology.py index a6c2d8bdc..852013a70 100644 --- a/src/CollectionPlugin/Test/TestGroupShareTopology.py +++ b/src/CollectionPlugin/Test/TestGroupShareTopology.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from GeomAPI import * +from GeomAPI import GeomAPI_Shape from salome.shaper import model model.begin() diff --git a/src/CollectionPlugin/Test/TestGroupSubstraction.py b/src/CollectionPlugin/Test/TestGroupSubstraction.py index 1df863196..6a14a7aa7 100644 --- a/src/CollectionPlugin/Test/TestGroupSubstraction.py +++ b/src/CollectionPlugin/Test/TestGroupSubstraction.py @@ -59,7 +59,7 @@ GroupSubstraction_1 = model.addGroupSubstraction( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(GroupSubstraction_1, 1) model.testNbSubResults(GroupSubstraction_1, [0]) diff --git a/src/ConnectorAPI/Test/Test17917.py b/src/ConnectorAPI/Test/Test17917.py index dbf54e014..f5c8c6ff4 100644 --- a/src/ConnectorAPI/Test/Test17917.py +++ b/src/ConnectorAPI/Test/Test17917.py @@ -72,8 +72,6 @@ model.end() # check what is exported to GEOM from salome.geom import geomBuilder -import os -import tempfile aComp = salome.myStudy.FindComponent("GEOM") iterator = salome.myStudy.NewChildIterator(aComp) diff --git a/src/ConnectorAPI/Test/Test18887.py b/src/ConnectorAPI/Test/Test18887.py index bb3124e61..42dc9c27e 100644 --- a/src/ConnectorAPI/Test/Test18887.py +++ b/src/ConnectorAPI/Test/Test18887.py @@ -16,7 +16,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import sys import salome salome.standalone() @@ -26,7 +25,7 @@ import salome_notebook ### ### SHAPER component ### -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model model.begin() diff --git a/src/ConnectorAPI/Test/Test2882.py b/src/ConnectorAPI/Test/Test2882.py index 3178fa236..78eb50d80 100644 --- a/src/ConnectorAPI/Test/Test2882.py +++ b/src/ConnectorAPI/Test/Test2882.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model @@ -173,8 +173,6 @@ model.end() import salome from salome.geom import geomBuilder -import os -import tempfile aComp = salome.myStudy.FindComponent("GEOM") iterator = salome.myStudy.NewChildIterator(aComp) diff --git a/src/ConnectorAPI/Test/Test3195.py b/src/ConnectorAPI/Test/Test3195.py index fec82341c..05603aa7a 100644 --- a/src/ConnectorAPI/Test/Test3195.py +++ b/src/ConnectorAPI/Test/Test3195.py @@ -16,7 +16,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import sys import salome salome.standalone() diff --git a/src/ConnectorAPI/Test/TestExportSTL.py b/src/ConnectorAPI/Test/TestExportSTL.py index 25685eb3b..ef332074b 100644 --- a/src/ConnectorAPI/Test/TestExportSTL.py +++ b/src/ConnectorAPI/Test/TestExportSTL.py @@ -70,8 +70,8 @@ def testExportSTL(theFile, theDelta, theErrorExpected=False): partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() - Box_1 = model.addBox(Part_1_doc, 10, 10, 10) - Box_2 = model.addBox(Part_1_doc, 20, 20, 20) + model.addBox(Part_1_doc, 10, 10, 10) + model.addBox(Part_1_doc, 20, 20, 20) model.do() # First export to GEOM diff --git a/src/ConnectorAPI/Test/TestExportToGEOM.py b/src/ConnectorAPI/Test/TestExportToGEOM.py index 16117d077..b9a6fc47a 100644 --- a/src/ConnectorAPI/Test/TestExportToGEOM.py +++ b/src/ConnectorAPI/Test/TestExportToGEOM.py @@ -32,7 +32,7 @@ geompy = geomBuilder.New() ## Get the last object published in the GEOM section of the object browser def getLastGEOMShape(): - sb = salome.myStudy.NewBuilder() + salome.myStudy.NewBuilder() comp = salome.myStudy.FindComponent("GEOM") obj = None if comp: @@ -68,7 +68,6 @@ def dumpShaper(fileName): dump.boolean("weak_naming").setValue(False) model.do() model.end() - pass # Create 2 boxes @@ -82,8 +81,8 @@ def testSeveralExportsToGEOM(): partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() - Box_1 = model.addBox(Part_1_doc, 10, 10, 10) - Box_2 = model.addBox(Part_1_doc, 20, 20, 20) + model.addBox(Part_1_doc, 10, 10, 10) + model.addBox(Part_1_doc, 20, 20, 20) Translation_1 = model.addTranslation( Part_1_doc, [model.selection("SOLID", "Box_1_1")], @@ -121,7 +120,7 @@ def testSeveralExportsToGEOM(): # Add a third box model.begin() - Box_3 = model.addBox(Part_1_doc, 10, 10, 10) + model.addBox(Part_1_doc, 10, 10, 10) Translation_2 = model.addTranslation( Part_1_doc, [model.selection("SOLID", "Box_3_1")], @@ -159,8 +158,6 @@ def testSeveralExportsToGEOM(): for f in files: os.remove(f) - pass - if __name__ == "__main__": testSeveralExportsToGEOM() diff --git a/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py b/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py index f1e8f02eb..681d501a4 100644 --- a/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py +++ b/src/ConnectorAPI/Test/TestExportToGEOMAllGroupsAndFields.py @@ -20,7 +20,6 @@ import os import tempfile -import sys import salome salome.standalone() @@ -36,7 +35,7 @@ geompy = geomBuilder.New() ## Get the last object published in the GEOM section of the object browser def getLastGEOMShape(): - sb = salome.myStudy.NewBuilder() + salome.myStudy.NewBuilder() comp = salome.myStudy.FindComponent("GEOM") obj = None if comp: @@ -72,7 +71,6 @@ def dumpShaper(fileName): dump.boolean("weak_naming").setValue(False) model.do() model.end() - pass def testGroupsAndFieldsExportToGEOM(): @@ -80,8 +78,8 @@ def testGroupsAndFieldsExportToGEOM(): partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() - Box_1 = model.addBox(Part_1_doc, 10, 10, 10) - Box_2 = model.addBox(Part_1_doc, 20, 20, 20) + model.addBox(Part_1_doc, 10, 10, 10) + model.addBox(Part_1_doc, 20, 20, 20) Translation_1 = model.addTranslation( Part_1_doc, [model.selection("SOLID", "Box_1_1")], @@ -97,7 +95,7 @@ def testGroupsAndFieldsExportToGEOM(): ], ) Partition_1.result().setName("Partition_1_1") - Box_3 = model.addBox(Part_1_doc, 10, 10, 10) + model.addBox(Part_1_doc, 10, 10, 10) Translation_2 = model.addTranslation( Part_1_doc, [model.selection("SOLID", "Box_3_1")], @@ -331,7 +329,6 @@ def checkGroupByCoords(group, coords, tolerance=1e-7): for coord in coords: p = geompy.MakeVertex(*coord) assert geompy.MinDistance(group, p) < tolerance - pass ## Check the result imported in GEOM @@ -414,8 +411,6 @@ def checkResultInGEOM(): 1.0, ] - pass - def checkDump(): # Dump the salome study (only CORBA modules, SHAPER dump is not in it) @@ -435,8 +430,7 @@ def checkDump(): exec(compile(open(dumpFileGeom).read(), dumpFileGeom, "exec")) # Clean files - files = [dumpFileGeom, dumpFileShaper] - pass + [dumpFileGeom, dumpFileShaper] if __name__ == "__main__": diff --git a/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py b/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py index b738fd322..baec0ab90 100644 --- a/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py +++ b/src/ConnectorAPI/Test/TestExportToGEOMPartSet.py @@ -18,13 +18,10 @@ # import salome -from ModelAPI import * +from ModelAPI import ModelAPI_Session from salome.shaper import model -import os -import tempfile - salome.standalone() from salome.geom import geomBuilder @@ -34,7 +31,7 @@ geompy = geomBuilder.New() ## Get the last object published in the GEOM section of the object browser def getGEOMShape(index): - sb = salome.myStudy.NewBuilder() + salome.myStudy.NewBuilder() comp = salome.myStudy.FindComponent("GEOM") obj = None if comp: diff --git a/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py b/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py index cee76d03b..68dc76a84 100644 --- a/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py +++ b/src/ConnectorAPI/Test/TestExportToGEOMWholeFeature.py @@ -22,9 +22,6 @@ from SketchAPI import * from salome.shaper import model -import os -import tempfile - salome.standalone() from salome.geom import geomBuilder @@ -34,7 +31,7 @@ geompy = geomBuilder.New() ## Get the last object published in the GEOM section of the object browser def getGEOMShape(index): - sb = salome.myStudy.NewBuilder() + salome.myStudy.NewBuilder() comp = salome.myStudy.FindComponent("GEOM") obj = None if comp: @@ -100,8 +97,8 @@ def testExportToGEOM(): SketchConstraintEqual_1 = Sketch_1.setEqual( SketchCircle_2.results()[1], SketchCircle_4.results()[1] ) - SketchConstraintRadius_1 = Sketch_1.setRadius(SketchCircle_2.results()[1], 20) - SketchConstraintRadius_2 = Sketch_1.setRadius(SketchCircle_1.results()[1], 25) + Sketch_1.setRadius(SketchCircle_2.results()[1], 20) + Sketch_1.setRadius(SketchCircle_1.results()[1], 25) SketchProjection_2 = Sketch_1.addProjection( model.selection("EDGE", "PartSet/OZ"), False ) diff --git a/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py b/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py index d6caab9d2..d489e3cdb 100644 --- a/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py +++ b/src/ConnectorAPI/Test/TestExportToGEOMWholeResult.py @@ -33,7 +33,7 @@ geompy = geomBuilder.New() ## Get the last object published in the GEOM section of the object browser def getLastGEOMShape(): - sb = salome.myStudy.NewBuilder() + salome.myStudy.NewBuilder() comp = salome.myStudy.FindComponent("GEOM") obj = None if comp: @@ -69,7 +69,6 @@ def dumpShaper(fileName): dump.boolean("weak_naming").setValue(False) model.do() model.end() - pass # Create 2 boxes @@ -83,8 +82,8 @@ def testExportToGEOM(): partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() - Box_1 = model.addBox(Part_1_doc, 10, 10, 10) - Box_2 = model.addBox(Part_1_doc, 20, 20, 20) + model.addBox(Part_1_doc, 10, 10, 10) + model.addBox(Part_1_doc, 20, 20, 20) Translation_1 = model.addTranslation( Part_1_doc, [model.selection("SOLID", "Box_1_1")], @@ -139,9 +138,7 @@ def testExportToGEOM(): exec(compile(open(dumpFileGeom).read(), dumpFileGeom, "exec")) # Clean files - files = [dumpFileGeom, dumpFileShaper] - - pass + [dumpFileGeom, dumpFileShaper] if __name__ == "__main__": diff --git a/src/ConnectorAPI/Test/TestExportXAOMem.py b/src/ConnectorAPI/Test/TestExportXAOMem.py index 885b6a570..9c54be16b 100644 --- a/src/ConnectorAPI/Test/TestExportXAOMem.py +++ b/src/ConnectorAPI/Test/TestExportXAOMem.py @@ -53,11 +53,11 @@ def testExportXAOMem(): partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() - Box_1 = model.addBox(Part_1_doc, 10, 10, 10) + model.addBox(Part_1_doc, 10, 10, 10) Group_1 = model.addGroup( Part_1_doc, "Faces", [model.selection("FACE", "Box_1_1/Top")] ) - Box_2 = model.addBox(Part_1_doc, 20, 20, 20) + model.addBox(Part_1_doc, 20, 20, 20) model.do() # Export to memory buffer (bytes array) @@ -86,7 +86,6 @@ def testExportXAOMem(): ) file_stats = os.stat(tmpfilename) assert len(Export_buff2) == file_stats.st_size - pass # Import to GEOM (imported1, b1, [], [Group_1], []) = geompy.ImportXAOMem( diff --git a/src/ConnectorAPI/Test/TestImportSTEP.py b/src/ConnectorAPI/Test/TestImportSTEP.py index 2cc52d0fc..c721c1acd 100644 --- a/src/ConnectorAPI/Test/TestImportSTEP.py +++ b/src/ConnectorAPI/Test/TestImportSTEP.py @@ -28,7 +28,6 @@ import salome import os -import math from tempfile import TemporaryDirectory from ModelAPI import * diff --git a/src/ConnectorAPI/Test/TestImportXAOMem.py b/src/ConnectorAPI/Test/TestImportXAOMem.py index 4287b51fc..1a359e080 100644 --- a/src/ConnectorAPI/Test/TestImportXAOMem.py +++ b/src/ConnectorAPI/Test/TestImportXAOMem.py @@ -63,10 +63,9 @@ def testImportXAOMem(): # export to XAO file and compare size of file and size of buffer with tempfile.TemporaryDirectory() as tmpdirname: tmpfilename = os.path.join(tmpdirname, "Box.xao") - exported = geompy.ExportXAO(Box_1, [Group_1], [], "XAO", tmpfilename, "") + geompy.ExportXAO(Box_1, [Group_1], [], "XAO", tmpfilename, "") file_stats = os.stat(tmpfilename) assert len(Export_buff) == file_stats.st_size - pass # Import to SHAPER model.begin() @@ -99,7 +98,7 @@ def testImportXAOMem(): assert res1 is not None res1It = GeomAPI_ShapeExplorer(res1.shape(), GeomAPI_Shape.FACE) assert res1It.more() - shape1 = res1It.current() + res1It.current() res1It.next() assert not res1It.more() p1 = res1.shape().middlePoint() @@ -109,7 +108,6 @@ def testImportXAOMem(): and math.fabs(p1.y() - 5) <= aTol and math.fabs(p1.z() - 10) <= aTol ), "({}, {}, {}) != ({}, {}, {})".format(p1.x(), p1.y(), p1.z(), 5, 5, 10) - pass def testImportXAOMem_EmptyName(): diff --git a/src/ConnectorAPI/Test/testme.py b/src/ConnectorAPI/Test/testme.py index 9769bf580..1a0f3fc82 100755 --- a/src/ConnectorAPI/Test/testme.py +++ b/src/ConnectorAPI/Test/testme.py @@ -31,7 +31,6 @@ class SalomeSession(object): module_dir = os.getenv("KERNEL_ROOT_DIR") if module_dir: run_script = os.path.join(module_dir, "bin", "salome", run_script) - pass sys.argv = [run_script] sys.argv += ["--terminal"] sys.argv += ["--modules=SHAPER,GEOM,SHAPERSTUDY,SMESH"] @@ -51,14 +50,10 @@ class SalomeSession(object): killSalomeWithPort.killMyPort(port) return - pass - class MyTest(unittest.TestCase): def testFunction(self): SalomeSession(sys.argv[1]) - pass - unittest.main(argv=sys.argv[:1]) diff --git a/src/ConnectorPlugin/ConnectorPlugin.py b/src/ConnectorPlugin/ConnectorPlugin.py index 2f37e4ae0..98496bc1e 100644 --- a/src/ConnectorPlugin/ConnectorPlugin.py +++ b/src/ConnectorPlugin/ConnectorPlugin.py @@ -32,7 +32,6 @@ class ConnectorPlugin(ModelAPI.ModelAPI_Plugin): ## The constructor. def __init__(self): ModelAPI.ModelAPI_Plugin.__init__(self) - pass ## Creates the feature objects of this plugin by the feature string ID. def createFeature(self, theFeatureID): diff --git a/src/ConnectorPlugin/ConnectorPlugin_ExportFeature.py b/src/ConnectorPlugin/ConnectorPlugin_ExportFeature.py index afe558119..95e9a6837 100644 --- a/src/ConnectorPlugin/ConnectorPlugin_ExportFeature.py +++ b/src/ConnectorPlugin/ConnectorPlugin_ExportFeature.py @@ -38,7 +38,6 @@ class ExportFeature(ModelAPI.ModelAPI_Feature): ## The constructor. def __init__(self): ModelAPI.ModelAPI_Feature.__init__(self) - pass @staticmethod ## Export kind. Static. @@ -123,9 +122,6 @@ class ExportFeature(ModelAPI.ModelAPI_Feature): self.geompy.addToStudyInFather(field, step, step_name) # Remove the temporary file os.remove(tmpXAOFile) - pass - pass - pass ## Exports all shapes and groups into the GEOM module. def execute(self): @@ -139,5 +135,3 @@ class ExportFeature(ModelAPI.ModelAPI_Feature): self.geompy = geomBuilder.New() self.exportViaXAO() - - pass diff --git a/src/ConnectorPlugin/ConnectorPlugin_PublishToStudyFeature.py b/src/ConnectorPlugin/ConnectorPlugin_PublishToStudyFeature.py index 2f11fcca0..9c27c38d9 100644 --- a/src/ConnectorPlugin/ConnectorPlugin_PublishToStudyFeature.py +++ b/src/ConnectorPlugin/ConnectorPlugin_PublishToStudyFeature.py @@ -23,7 +23,7 @@ import ModelAPI import ExchangeAPI import EventsAPI -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer import GeomAlgoAPI import salome @@ -39,7 +39,6 @@ class PublishToStudyFeature(ModelAPI.ModelAPI_Feature): ## The constructor. def __init__(self): ModelAPI.ModelAPI_Feature.__init__(self) - pass @staticmethod ## Export kind. Static. diff --git a/src/ConstructionAPI/Test/TestPoint.py b/src/ConstructionAPI/Test/TestPoint.py index 7c759e4e4..072e090f2 100644 --- a/src/ConstructionAPI/Test/TestPoint.py +++ b/src/ConstructionAPI/Test/TestPoint.py @@ -37,7 +37,7 @@ class PointTestCase(unittest.TestCase): self.session.closeAll() def test_ConstructorWithValues(self): - point = ConstructionAPI.ConstructionAPI_Point(self.feature, 10, "20", "x + 30") + ConstructionAPI.ConstructionAPI_Point(self.feature, 10, "20", "x + 30") # self.assertEqual(10, point.x().value()) # self.assertEqual("20", point.y().text()) # self.assertEqual("x + 30", point.z().text()) diff --git a/src/ConstructionPlugin/Test/Test19207.py b/src/ConstructionPlugin/Test/Test19207.py index 9bc20c46f..29d6d1aeb 100644 --- a/src/ConstructionPlugin/Test/Test19207.py +++ b/src/ConstructionPlugin/Test/Test19207.py @@ -41,7 +41,7 @@ Filling_1 = model.addFilling( Plane_1 = model.addPlane(Part_1_doc, model.selection("FACE", "Filling_1_1"), 10, False) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session factory = ModelAPI_Session.get().validators() assert factory.validate(Plane_1.feature()) diff --git a/src/ConstructionPlugin/Test/TestAxisCreation.py b/src/ConstructionPlugin/Test/TestAxisCreation.py index 44941dc02..72fd12b78 100644 --- a/src/ConstructionPlugin/Test/TestAxisCreation.py +++ b/src/ConstructionPlugin/Test/TestAxisCreation.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math from ModelAPI import * from salome.shaper import model diff --git a/src/ConstructionPlugin/Test/TestAxis_ErrorMsg.py b/src/ConstructionPlugin/Test/TestAxis_ErrorMsg.py index 1753f5b82..40295ed32 100644 --- a/src/ConstructionPlugin/Test/TestAxis_ErrorMsg.py +++ b/src/ConstructionPlugin/Test/TestAxis_ErrorMsg.py @@ -18,7 +18,7 @@ # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/ConstructionPlugin/Test/TestPlane_ErrorMsg.py b/src/ConstructionPlugin/Test/TestPlane_ErrorMsg.py index 458a45000..cce0c89dc 100644 --- a/src/ConstructionPlugin/Test/TestPlane_ErrorMsg.py +++ b/src/ConstructionPlugin/Test/TestPlane_ErrorMsg.py @@ -18,7 +18,7 @@ # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/ConstructionPlugin/Test/TestPoint_34658.py b/src/ConstructionPlugin/Test/TestPoint_34658.py index 141bbbb2f..1811cc629 100644 --- a/src/ConstructionPlugin/Test/TestPoint_34658.py +++ b/src/ConstructionPlugin/Test/TestPoint_34658.py @@ -17,9 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import sys import salome -from ModelAPI import * +from ModelAPI import modelAPI_ResultConstruction def assertPoint(aPoint): diff --git a/src/ConstructionPlugin/Test/TestPoint_ErrorMsg.py b/src/ConstructionPlugin/Test/TestPoint_ErrorMsg.py index 2b321a573..601f9768a 100644 --- a/src/ConstructionPlugin/Test/TestPoint_ErrorMsg.py +++ b/src/ConstructionPlugin/Test/TestPoint_ErrorMsg.py @@ -18,7 +18,7 @@ # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/ConstructionPlugin/Test/TestPoint_IntersectLineAndPlane.py b/src/ConstructionPlugin/Test/TestPoint_IntersectLineAndPlane.py index 588a250a7..87fee60dc 100644 --- a/src/ConstructionPlugin/Test/TestPoint_IntersectLineAndPlane.py +++ b/src/ConstructionPlugin/Test/TestPoint_IntersectLineAndPlane.py @@ -22,7 +22,7 @@ Test case for Construction Point feature as intersection of line and plane. """ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Vertex model.begin() partSet = model.moduleDocument() diff --git a/src/ConstructionPlugin/Test/TestPoint_IntersectPlanes.py b/src/ConstructionPlugin/Test/TestPoint_IntersectPlanes.py index 7d740efbd..2a3678c00 100644 --- a/src/ConstructionPlugin/Test/TestPoint_IntersectPlanes.py +++ b/src/ConstructionPlugin/Test/TestPoint_IntersectPlanes.py @@ -22,7 +22,7 @@ Test case for Construction Point feature by planes intersection. """ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Vertex model.begin() partSet = model.moduleDocument() diff --git a/src/ConstructionPlugin/Test/TestPoint_VertexSelection.py b/src/ConstructionPlugin/Test/TestPoint_VertexSelection.py index 87eb03e29..ed72b3871 100644 --- a/src/ConstructionPlugin/Test/TestPoint_VertexSelection.py +++ b/src/ConstructionPlugin/Test/TestPoint_VertexSelection.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model model.begin() diff --git a/src/ConstructionPlugin/Test/UnitTestAxis.py b/src/ConstructionPlugin/Test/UnitTestAxis.py index d9a2acf11..b3ff1b79e 100644 --- a/src/ConstructionPlugin/Test/UnitTestAxis.py +++ b/src/ConstructionPlugin/Test/UnitTestAxis.py @@ -53,7 +53,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2016-01-04" diff --git a/src/ExchangePlugin/Test/Test2290.py b/src/ExchangePlugin/Test/Test2290.py index 853c44382..b2ede4615 100644 --- a/src/ExchangePlugin/Test/Test2290.py +++ b/src/ExchangePlugin/Test/Test2290.py @@ -40,7 +40,7 @@ Group_1 = model.addGroup( ) model.do() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/ExchangePlugin/Test/Test2459.py b/src/ExchangePlugin/Test/Test2459.py index d7fb13bb5..247d92416 100644 --- a/src/ExchangePlugin/Test/Test2459.py +++ b/src/ExchangePlugin/Test/Test2459.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Arc, SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExport.py b/src/ExchangePlugin/Test/TestExport.py index d8cf60254..10023e15a 100755 --- a/src/ExchangePlugin/Test/TestExport.py +++ b/src/ExchangePlugin/Test/TestExport.py @@ -25,10 +25,9 @@ # Initialization of the test # ========================================================================= import os -import math from tempfile import TemporaryDirectory -from ModelAPI import * +from ModelAPI import ModelAPI_Session from TestImport import testImport @@ -60,7 +59,7 @@ def testExport( ): # Import a reference part aSession.startOperation("Add part") - aPartFeature = aSession.moduleDocument().addFeature("Part") + aSession.moduleDocument().addFeature("Part") aSession.finishOperation() aPart = aSession.activeDocument() @@ -99,14 +98,12 @@ def testExport( def testExportXAO(theFile, theEmptyFormat=False): type = "XAO" - format = "XAO" if theEmptyFormat: type = "Regular" - format = "" # Import a reference part aSession.startOperation("Add part") - aPartFeature = aSession.moduleDocument().addFeature("Part") + aSession.moduleDocument().addFeature("Part") aSession.finishOperation() aPart = aSession.activeDocument() diff --git a/src/ExchangePlugin/Test/TestExportPart_Failure_1.py b/src/ExchangePlugin/Test/TestExportPart_Failure_1.py index 4743d1120..a8578f77d 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Failure_1.py +++ b/src/ExchangePlugin/Test/TestExportPart_Failure_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Failure_2.py b/src/ExchangePlugin/Test/TestExportPart_Failure_2.py index 42820e159..ebb26d45a 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Failure_2.py +++ b/src/ExchangePlugin/Test/TestExportPart_Failure_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_FullPartSet.py b/src/ExchangePlugin/Test/TestExportPart_FullPartSet.py index 1fbb1a1a2..0e1c14305 100644 --- a/src/ExchangePlugin/Test/TestExportPart_FullPartSet.py +++ b/src/ExchangePlugin/Test/TestExportPart_FullPartSet.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_FullPart_1.py b/src/ExchangePlugin/Test/TestExportPart_FullPart_1.py index d708069a5..8f9b630d0 100644 --- a/src/ExchangePlugin/Test/TestExportPart_FullPart_1.py +++ b/src/ExchangePlugin/Test/TestExportPart_FullPart_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_FullPart_2.py b/src/ExchangePlugin/Test/TestExportPart_FullPart_2.py index 601f9f00f..93a33c3cd 100644 --- a/src/ExchangePlugin/Test/TestExportPart_FullPart_2.py +++ b/src/ExchangePlugin/Test/TestExportPart_FullPart_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_PartSet.py b/src/ExchangePlugin/Test/TestExportPart_PartSet.py index 5dcad15ef..4f6277afe 100644 --- a/src/ExchangePlugin/Test/TestExportPart_PartSet.py +++ b/src/ExchangePlugin/Test/TestExportPart_PartSet.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_1.py b/src/ExchangePlugin/Test/TestExportPart_Results_1.py index 4a6470588..68cc3ca36 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_1.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_2.py b/src/ExchangePlugin/Test/TestExportPart_Results_2.py index 4b9643d5f..202982ef5 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_2.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_3.py b/src/ExchangePlugin/Test/TestExportPart_Results_3.py index fc770dcae..f632d00fe 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_3.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_3.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_4.py b/src/ExchangePlugin/Test/TestExportPart_Results_4.py index 19b89fb36..2a5d790f5 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_4.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_4.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_5.py b/src/ExchangePlugin/Test/TestExportPart_Results_5.py index dd1fdd79d..9ee6ae2da 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_5.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_5.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_6.py b/src/ExchangePlugin/Test/TestExportPart_Results_6.py index 1df1337db..1705bca18 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_6.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_6.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_7.py b/src/ExchangePlugin/Test/TestExportPart_Results_7.py index e3bc60a45..ae2de2381 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_7.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_7.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExportPart_Results_8.py b/src/ExchangePlugin/Test/TestExportPart_Results_8.py index a0f8b4c45..40dc5ede2 100644 --- a/src/ExchangePlugin/Test/TestExportPart_Results_8.py +++ b/src/ExchangePlugin/Test/TestExportPart_Results_8.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ExchangePlugin/Test/TestExport_FiniteValidator.py b/src/ExchangePlugin/Test/TestExport_FiniteValidator.py index 35c868253..6f926862e 100644 --- a/src/ExchangePlugin/Test/TestExport_FiniteValidator.py +++ b/src/ExchangePlugin/Test/TestExport_FiniteValidator.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() diff --git a/src/ExchangePlugin/Test/TestImport.py b/src/ExchangePlugin/Test/TestImport.py index deeaa1d96..3779e7684 100644 --- a/src/ExchangePlugin/Test/TestImport.py +++ b/src/ExchangePlugin/Test/TestImport.py @@ -48,7 +48,7 @@ def getShapePath(path): def testImport(theType, theFile, theVolume, theArea, theDelta, theErrorExpected=False): # Create a part for import aSession.startOperation("Create part for import") - aPartFeature = aSession.moduleDocument().addFeature("Part") + aSession.moduleDocument().addFeature("Part") aSession.finishOperation() aPart = aSession.activeDocument() @@ -119,7 +119,7 @@ def testImport(theType, theFile, theVolume, theArea, theDelta, theErrorExpected= def testImportXAO(): # Create a part for import aSession.startOperation("Create part for import") - aPartFeature = aSession.moduleDocument().addFeature("Part") + aSession.moduleDocument().addFeature("Part") aSession.finishOperation() aPart = aSession.activeDocument() diff --git a/src/ExchangePlugin/Test/TestImportImage_3.py b/src/ExchangePlugin/Test/TestImportImage_3.py index 017738e01..b53bd5e2f 100755 --- a/src/ExchangePlugin/Test/TestImportImage_3.py +++ b/src/ExchangePlugin/Test/TestImportImage_3.py @@ -30,7 +30,7 @@ if QApplication.instance() is None: app = QApplication([]) from tempfile import TemporaryDirectory -from ModelAPI import * +from ModelAPI import ModelAPI_Session, StringList, modelAPI_ResultPart, objectToFeature data_dir = os.path.join(os.path.dirname(inspect.getfile(lambda: None)), "data") diff --git a/src/ExchangePlugin/Test/TestImportPart_Multiple.py b/src/ExchangePlugin/Test/TestImportPart_Multiple.py index 34fa1acd5..e52b2a413 100644 --- a/src/ExchangePlugin/Test/TestImportPart_Multiple.py +++ b/src/ExchangePlugin/Test/TestImportPart_Multiple.py @@ -23,7 +23,6 @@ from SketchAPI import * from salome.shaper import model import os -import math model.begin() partSet = model.moduleDocument() diff --git a/src/ExchangePlugin/Test/TestStep1.py b/src/ExchangePlugin/Test/TestStep1.py index f747cc71c..e58192cf9 100644 --- a/src/ExchangePlugin/Test/TestStep1.py +++ b/src/ExchangePlugin/Test/TestStep1.py @@ -19,7 +19,7 @@ from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line model.begin() partSet = model.moduleDocument() diff --git a/src/ExchangePlugin/Test/testme.py b/src/ExchangePlugin/Test/testme.py index 042853684..1af4b7275 100755 --- a/src/ExchangePlugin/Test/testme.py +++ b/src/ExchangePlugin/Test/testme.py @@ -48,7 +48,6 @@ class SalomeSession(object): proc.kill() out, err = proc.communicate() error = "Killed by CPU limit." - pass print(err) assert isOk, "Test failed. {}".format(error) @@ -80,14 +79,10 @@ class SalomeSession(object): killSalomeWithPort.killMyPort(port) return - pass - class MyTest(unittest.TestCase): def testFunction(self): SalomeSession(sys.argv[1]) - pass - unittest.main(argv=sys.argv[:1]) diff --git a/src/FeaturesPlugin/Test/Test17281.py b/src/FeaturesPlugin/Test/Test17281.py index f5b20631e..cc2195057 100644 --- a/src/FeaturesPlugin/Test/Test17281.py +++ b/src/FeaturesPlugin/Test/Test17281.py @@ -124,7 +124,7 @@ model.end() assert Pipe_2.feature().error() == "" -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Pipe_2, 1) model.testNbSubResults(Pipe_2, [0]) diff --git a/src/FeaturesPlugin/Test/Test1876.py b/src/FeaturesPlugin/Test/Test1876.py index 050d025b7..a157334d7 100644 --- a/src/FeaturesPlugin/Test/Test1876.py +++ b/src/FeaturesPlugin/Test/Test1876.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/Test18836.py b/src/FeaturesPlugin/Test/Test18836.py index 05cda15ef..f7fd8b15b 100644 --- a/src/FeaturesPlugin/Test/Test18836.py +++ b/src/FeaturesPlugin/Test/Test18836.py @@ -134,7 +134,7 @@ Extrusion_2 = model.addExtrusion( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Extrusion_1, 1) model.testNbSubResults(Extrusion_1, [3]) diff --git a/src/FeaturesPlugin/Test/Test19065.py b/src/FeaturesPlugin/Test/Test19065.py index 70510f5e6..759008470 100644 --- a/src/FeaturesPlugin/Test/Test19065.py +++ b/src/FeaturesPlugin/Test/Test19065.py @@ -143,7 +143,7 @@ Cut_1 = model.addCut( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Pipe_1, 1) model.testNbSubResults(Pipe_1, [0]) diff --git a/src/FeaturesPlugin/Test/Test19066.py b/src/FeaturesPlugin/Test/Test19066.py index 378c33843..b6f384743 100644 --- a/src/FeaturesPlugin/Test/Test19066.py +++ b/src/FeaturesPlugin/Test/Test19066.py @@ -236,7 +236,7 @@ Pipe_1 = model.addPipe( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Pipe_1, 1) model.testNbSubResults(Pipe_1, [0]) diff --git a/src/FeaturesPlugin/Test/Test19115.py b/src/FeaturesPlugin/Test/Test19115.py index b86b5a2e7..4882cf10c 100644 --- a/src/FeaturesPlugin/Test/Test19115.py +++ b/src/FeaturesPlugin/Test/Test19115.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from GeomAPI import * +from GeomAPI import GeomAPI_Shape from salome.shaper import model model.begin() diff --git a/src/FeaturesPlugin/Test/Test1922.py b/src/FeaturesPlugin/Test/Test1922.py index 8e04a3c7b..1dea0b1a6 100644 --- a/src/FeaturesPlugin/Test/Test1922.py +++ b/src/FeaturesPlugin/Test/Test1922.py @@ -384,7 +384,7 @@ Partition_1 = model.addPartition(Part_1_doc, Partition_1_objects) model.do() model.end() -from ModelAPI import * +from ModelAPI import modelAPI_ResultBody PartitionFeature = Partition_1.feature() assert len(PartitionFeature.results()) == 1 diff --git a/src/FeaturesPlugin/Test/Test19931.py b/src/FeaturesPlugin/Test/Test19931.py index 842fa5dbd..bac5b65c1 100644 --- a/src/FeaturesPlugin/Test/Test19931.py +++ b/src/FeaturesPlugin/Test/Test19931.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test20245_2.py b/src/FeaturesPlugin/Test/Test20245_2.py index de1d46bf9..7bd0275d9 100644 --- a/src/FeaturesPlugin/Test/Test20245_2.py +++ b/src/FeaturesPlugin/Test/Test20245_2.py @@ -129,7 +129,7 @@ Split_1 = model.addSplit( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Split_1, 1) model.testNbSubResults(Split_1, [5]) diff --git a/src/FeaturesPlugin/Test/Test20247.py b/src/FeaturesPlugin/Test/Test20247.py index 5535471c0..6a3cc8219 100644 --- a/src/FeaturesPlugin/Test/Test20247.py +++ b/src/FeaturesPlugin/Test/Test20247.py @@ -66,7 +66,7 @@ Extrusion_1 = model.addExtrusion( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Extrusion_1, 1) model.testNbSubResults(Extrusion_1, [0]) diff --git a/src/FeaturesPlugin/Test/Test2172.py b/src/FeaturesPlugin/Test/Test2172.py index 1eb260dc0..47dfc17a9 100644 --- a/src/FeaturesPlugin/Test/Test2172.py +++ b/src/FeaturesPlugin/Test/Test2172.py @@ -201,7 +201,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2197_1.py b/src/FeaturesPlugin/Test/Test2197_1.py index 01a42cc86..696e81d7d 100644 --- a/src/FeaturesPlugin/Test/Test2197_1.py +++ b/src/FeaturesPlugin/Test/Test2197_1.py @@ -72,7 +72,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() for aGroupIter in [Group_1, Group_2]: diff --git a/src/FeaturesPlugin/Test/Test2197_2.py b/src/FeaturesPlugin/Test/Test2197_2.py index 93f841e72..1ee1f65de 100644 --- a/src/FeaturesPlugin/Test/Test2197_2.py +++ b/src/FeaturesPlugin/Test/Test2197_2.py @@ -66,7 +66,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() for aGroupIter in [Group_1, Group_2, Group_3]: diff --git a/src/FeaturesPlugin/Test/Test2197_3.py b/src/FeaturesPlugin/Test/Test2197_3.py index 61ff3ed51..66f49eac4 100644 --- a/src/FeaturesPlugin/Test/Test2197_3.py +++ b/src/FeaturesPlugin/Test/Test2197_3.py @@ -82,7 +82,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2197_4.py b/src/FeaturesPlugin/Test/Test2197_4.py index e1474420e..f52a9145b 100644 --- a/src/FeaturesPlugin/Test/Test2197_4.py +++ b/src/FeaturesPlugin/Test/Test2197_4.py @@ -117,7 +117,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2222.py b/src/FeaturesPlugin/Test/Test2222.py index f178caf30..8d8802634 100644 --- a/src/FeaturesPlugin/Test/Test2222.py +++ b/src/FeaturesPlugin/Test/Test2222.py @@ -67,7 +67,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2233.py b/src/FeaturesPlugin/Test/Test2233.py index 5a583a2f5..6978d76b9 100644 --- a/src/FeaturesPlugin/Test/Test2233.py +++ b/src/FeaturesPlugin/Test/Test2233.py @@ -68,7 +68,7 @@ model.do() model.end() # check that resulting group selection is valid and names are different -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2240.py b/src/FeaturesPlugin/Test/Test2240.py index a2750e9ff..6940c4a61 100644 --- a/src/FeaturesPlugin/Test/Test2240.py +++ b/src/FeaturesPlugin/Test/Test2240.py @@ -411,7 +411,7 @@ model.do() model.end() # check that partition constructed correctly -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Partition_2.feature()) diff --git a/src/FeaturesPlugin/Test/Test2246.py b/src/FeaturesPlugin/Test/Test2246.py index 9ea0dbf4b..7add932f4 100644 --- a/src/FeaturesPlugin/Test/Test2246.py +++ b/src/FeaturesPlugin/Test/Test2246.py @@ -76,7 +76,7 @@ model.do() model.end() # check that resulting group selection is valid, names exist and different -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2248.py b/src/FeaturesPlugin/Test/Test2248.py index 11c513eeb..59b1f9be6 100644 --- a/src/FeaturesPlugin/Test/Test2248.py +++ b/src/FeaturesPlugin/Test/Test2248.py @@ -282,7 +282,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2251.py b/src/FeaturesPlugin/Test/Test2251.py index 937c9957d..23b7708a7 100644 --- a/src/FeaturesPlugin/Test/Test2251.py +++ b/src/FeaturesPlugin/Test/Test2251.py @@ -202,7 +202,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test22847.py b/src/FeaturesPlugin/Test/Test22847.py index 7a4620d1a..0fa8ec2d1 100644 --- a/src/FeaturesPlugin/Test/Test22847.py +++ b/src/FeaturesPlugin/Test/Test22847.py @@ -80,7 +80,7 @@ Part_1_doc.moveFeature(Group_1.feature(), Remove_SubShapes_1.feature()) model.end() # check that all groups are correct -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() diff --git a/src/FeaturesPlugin/Test/Test2375.py b/src/FeaturesPlugin/Test/Test2375.py index 4fdfb19cc..5652794ff 100644 --- a/src/FeaturesPlugin/Test/Test2375.py +++ b/src/FeaturesPlugin/Test/Test2375.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2465.py b/src/FeaturesPlugin/Test/Test2465.py index 3b8e8c697..f6c8bae4a 100644 --- a/src/FeaturesPlugin/Test/Test2465.py +++ b/src/FeaturesPlugin/Test/Test2465.py @@ -42,7 +42,7 @@ model.do() model.end() # check that for the linear copy direction the elliptical edge is invalid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert not aFactory.validate(LinearCopy_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test2495.py b/src/FeaturesPlugin/Test/Test2495.py index 6681091ba..28886b10c 100644 --- a/src/FeaturesPlugin/Test/Test2495.py +++ b/src/FeaturesPlugin/Test/Test2495.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2514.py b/src/FeaturesPlugin/Test/Test2514.py index d67019614..eb3be5cf9 100644 --- a/src/FeaturesPlugin/Test/Test2514.py +++ b/src/FeaturesPlugin/Test/Test2514.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Circle, SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2520.py b/src/FeaturesPlugin/Test/Test2520.py index c94fa89e6..fd8b65546 100644 --- a/src/FeaturesPlugin/Test/Test2520.py +++ b/src/FeaturesPlugin/Test/Test2520.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2588.py b/src/FeaturesPlugin/Test/Test2588.py index e4f67f283..9322a8f3d 100644 --- a/src/FeaturesPlugin/Test/Test2588.py +++ b/src/FeaturesPlugin/Test/Test2588.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2631.py b/src/FeaturesPlugin/Test/Test2631.py index b5815da35..bc062c1a2 100644 --- a/src/FeaturesPlugin/Test/Test2631.py +++ b/src/FeaturesPlugin/Test/Test2631.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2686.py b/src/FeaturesPlugin/Test/Test2686.py index 0d818c419..40b8fc515 100644 --- a/src/FeaturesPlugin/Test/Test2686.py +++ b/src/FeaturesPlugin/Test/Test2686.py @@ -18,7 +18,7 @@ # from GeomAPI import GeomAPI_Pnt -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2693.py b/src/FeaturesPlugin/Test/Test2693.py index b7d60e532..000c30db3 100644 --- a/src/FeaturesPlugin/Test/Test2693.py +++ b/src/FeaturesPlugin/Test/Test2693.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2698.py b/src/FeaturesPlugin/Test/Test2698.py index 84afe229b..c34437b26 100644 --- a/src/FeaturesPlugin/Test/Test2698.py +++ b/src/FeaturesPlugin/Test/Test2698.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2701.py b/src/FeaturesPlugin/Test/Test2701.py index 4a5cfe048..20fdeec50 100644 --- a/src/FeaturesPlugin/Test/Test2701.py +++ b/src/FeaturesPlugin/Test/Test2701.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2724.py b/src/FeaturesPlugin/Test/Test2724.py index 7fd182c52..91fc3519a 100644 --- a/src/FeaturesPlugin/Test/Test2724.py +++ b/src/FeaturesPlugin/Test/Test2724.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test2751.py b/src/FeaturesPlugin/Test/Test2751.py index 6d89b6981..9b85447e6 100644 --- a/src/FeaturesPlugin/Test/Test2751.py +++ b/src/FeaturesPlugin/Test/Test2751.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test3033.py b/src/FeaturesPlugin/Test/Test3033.py index 95d19aa04..18e62c00c 100644 --- a/src/FeaturesPlugin/Test/Test3033.py +++ b/src/FeaturesPlugin/Test/Test3033.py @@ -59,7 +59,7 @@ ExtrusionCut_1.setNestedSketch(Sketch_2) model.end() # check the extrusion-cut result is correct -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(ExtrusionCut_1.feature()) diff --git a/src/FeaturesPlugin/Test/Test3076.py b/src/FeaturesPlugin/Test/Test3076.py index 5539ba608..59a8f6fbd 100644 --- a/src/FeaturesPlugin/Test/Test3076.py +++ b/src/FeaturesPlugin/Test/Test3076.py @@ -1,4 +1,4 @@ -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/Test3137_1.py b/src/FeaturesPlugin/Test/Test3137_1.py index 55fee06ad..593c8e963 100644 --- a/src/FeaturesPlugin/Test/Test3137_1.py +++ b/src/FeaturesPlugin/Test/Test3137_1.py @@ -94,7 +94,7 @@ LinearCopy_2 = model.addMultiTranslation( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(LinearCopy_2, 16) model.testNbSubResults(LinearCopy_2, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]) diff --git a/src/FeaturesPlugin/Test/Test3137_2.py b/src/FeaturesPlugin/Test/Test3137_2.py index 2f5936eff..242ac589a 100644 --- a/src/FeaturesPlugin/Test/Test3137_2.py +++ b/src/FeaturesPlugin/Test/Test3137_2.py @@ -78,7 +78,7 @@ AngularCopy_1 = model.addMultiRotation( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(AngularCopy_1, 4) model.testNbSubResults(AngularCopy_1, [0, 0, 0, 0]) diff --git a/src/FeaturesPlugin/Test/Test3139.py b/src/FeaturesPlugin/Test/Test3139.py index 9edc0ced9..54e44ccea 100644 --- a/src/FeaturesPlugin/Test/Test3139.py +++ b/src/FeaturesPlugin/Test/Test3139.py @@ -232,7 +232,7 @@ model.do() model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Part_1, 1) model.testNbSubResults(Part_1, [0]) diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_ErrorMsg.py b/src/FeaturesPlugin/Test/TestBooleanCommon_ErrorMsg.py index d6864a4a6..6f905a608 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_ErrorMsg.py @@ -36,7 +36,7 @@ Part_1_doc.removeFeature(Common_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_1.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_1.py index 8a3e50bd9..4cfdafa39 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_2.py index d7a148b34..ef5912385 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v0_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py index 214118a65..46a0c3d71 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py index 6cfa2563d..4b178caf2 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_MultiLevelCompound_v20190506_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_WireCompound_WireCompound.py b/src/FeaturesPlugin/Test/TestBooleanCommon_WireCompound_WireCompound.py index f6d3a94b8..6142bb4a2 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_WireCompound_WireCompound.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_WireCompound_WireCompound.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCommon_Wire_Wire.py b/src/FeaturesPlugin/Test/TestBooleanCommon_Wire_Wire.py index e3c0aee0d..a1633795d 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCommon_Wire_Wire.py +++ b/src/FeaturesPlugin/Test/TestBooleanCommon_Wire_Wire.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_ErrorMsg.py b/src/FeaturesPlugin/Test/TestBooleanCut_ErrorMsg.py index 103f5ff84..f19b58e99 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCut_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestBooleanCut_ErrorMsg.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_1.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_1.py index 87474b59b..20d5c5d11 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py index d588091f0..11d4ada73 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v0_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py index 4747aeecb..05cb1b314 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py index 4c7e6a823..be457d073 100644 --- a/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanCut_MultiLevelCompound_v20190506_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_ErrorMsg.py b/src/FeaturesPlugin/Test/TestBooleanFuse_ErrorMsg.py index 31b1f50e5..51c4ad008 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_ErrorMsg.py @@ -61,7 +61,7 @@ Part_1_doc.removeFeature(Fuse_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_1.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_1.py index ae6fee9e9..29575efe8 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py index 61f41c674..42be30e79 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_4.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_4.py index 8c68bceee..a02b4b349 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_4.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v0_4.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_1.py index b5af3d30e..58c31cc80 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_2.py index 6c5123541..f50a0f4c5 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_4.py b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_4.py index f72a26e88..bc7c4aae5 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_4.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_4.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSmash_ErrorMsg.py b/src/FeaturesPlugin/Test/TestBooleanSmash_ErrorMsg.py index 27c7ba7b7..adb740efe 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSmash_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestBooleanSmash_ErrorMsg.py @@ -93,7 +93,7 @@ Part_1_doc.removeFeature(Smash_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_1.py b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_1.py index 8a885bb35..f565dbdb5 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_2.py index 54c430b10..e7cf1f45f 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v0_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_1.py index 3a0dd9288..71b0fb193 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_2.py index 77bfeae27..b3705ab1a 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanSmash_MultiLevelCompound_v20190506_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSplit_ErrorMsg.py b/src/FeaturesPlugin/Test/TestBooleanSplit_ErrorMsg.py index 1a92f8777..5baecadd0 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSplit_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplit_ErrorMsg.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_1.py b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_1.py index 8f30ec61f..9b18212bb 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_2.py index e7c9b80f4..cc9d041da 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v0_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_1.py index ec0cbe7a9..5fdf4d40b 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_1.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_2.py index b59e1ae2d..1a0c4ea61 100644 --- a/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_2.py +++ b/src/FeaturesPlugin/Test/TestBooleanSplit_MultiLevelCompound_v20190506_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestBoundingBox.py b/src/FeaturesPlugin/Test/TestBoundingBox.py index bd0c932c4..a32a56212 100644 --- a/src/FeaturesPlugin/Test/TestBoundingBox.py +++ b/src/FeaturesPlugin/Test/TestBoundingBox.py @@ -25,7 +25,6 @@ # ========================================================================= -import os import math from ModelAPI import * diff --git a/src/FeaturesPlugin/Test/TestCheckSharedFaces.py b/src/FeaturesPlugin/Test/TestCheckSharedFaces.py index f269c25ab..69bd7ebb3 100644 --- a/src/FeaturesPlugin/Test/TestCheckSharedFaces.py +++ b/src/FeaturesPlugin/Test/TestCheckSharedFaces.py @@ -25,9 +25,6 @@ # ========================================================================= -import os -import math - from ModelAPI import * from GeomAPI import * from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestCopyFeature.py b/src/FeaturesPlugin/Test/TestCopyFeature.py index ac24932e7..31e844992 100644 --- a/src/FeaturesPlugin/Test/TestCopyFeature.py +++ b/src/FeaturesPlugin/Test/TestCopyFeature.py @@ -56,7 +56,7 @@ model.do() Part_1_doc.moveFeature(Group_1.feature(), Copy_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/TestCopyFeatureMoveGroupOfFeature.py b/src/FeaturesPlugin/Test/TestCopyFeatureMoveGroupOfFeature.py index 2b7ac53bb..94d8c6234 100644 --- a/src/FeaturesPlugin/Test/TestCopyFeatureMoveGroupOfFeature.py +++ b/src/FeaturesPlugin/Test/TestCopyFeatureMoveGroupOfFeature.py @@ -51,7 +51,7 @@ model.do() Part_1_doc.moveFeature(Group_1.feature(), Copy_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/TestCopyMoveResult.py b/src/FeaturesPlugin/Test/TestCopyMoveResult.py index 528fec839..da9a5d8c9 100644 --- a/src/FeaturesPlugin/Test/TestCopyMoveResult.py +++ b/src/FeaturesPlugin/Test/TestCopyMoveResult.py @@ -101,7 +101,7 @@ model.do() Part_1_doc.moveFeature(Group_1.feature(), Fillet_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/FeaturesPlugin/Test/TestCopyMoveSubShapes.py b/src/FeaturesPlugin/Test/TestCopyMoveSubShapes.py index 4f1f78458..56d218c45 100644 --- a/src/FeaturesPlugin/Test/TestCopyMoveSubShapes.py +++ b/src/FeaturesPlugin/Test/TestCopyMoveSubShapes.py @@ -20,7 +20,7 @@ # Checks selection of the sub-shapes move to the end with combination of 2 Copy features in history from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestCopyWholeFeature.py b/src/FeaturesPlugin/Test/TestCopyWholeFeature.py index 0c3152f7c..2ff028539 100644 --- a/src/FeaturesPlugin/Test/TestCopyWholeFeature.py +++ b/src/FeaturesPlugin/Test/TestCopyWholeFeature.py @@ -96,7 +96,7 @@ model.end() assert Copy_1.feature().results().size() == 2 -from ModelAPI import * +from ModelAPI import modelAPI_ResultBody assert Copy_1.feature().results()[0].data().name() == "Extrusion_1_1_1" assert ( diff --git a/src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py b/src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py index c86aff1b6..0ab5ee458 100644 --- a/src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestCopy_ErrorMsg.py @@ -37,7 +37,7 @@ Copy_1 = model.addCopy(Part_1_doc, [model.selection("COMPOUND", "all-in-Sketch_1 Copy_2 = model.addCopy(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], 1) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert not aFactory.validate(Copy_1.feature()) diff --git a/src/FeaturesPlugin/Test/TestDefeaturing_OnCompound.py b/src/FeaturesPlugin/Test/TestDefeaturing_OnCompound.py index 0f7496bf9..2f42108b4 100644 --- a/src/FeaturesPlugin/Test/TestDefeaturing_OnCompound.py +++ b/src/FeaturesPlugin/Test/TestDefeaturing_OnCompound.py @@ -70,7 +70,7 @@ Defeaturing_1 = model.addDefeaturing(Part_1_doc, Defeaturing_1_objects) model.testHaveNamingSubshapes(Defeaturing_1, model, Part_1_doc) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Defeaturing_1, 1) model.testNbSubResults(Defeaturing_1, [4]) diff --git a/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid1.py b/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid1.py index 41dcc3adb..a26ac30b9 100644 --- a/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid1.py +++ b/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid1.py @@ -53,7 +53,7 @@ Defeaturing_1 = model.addDefeaturing( model.testHaveNamingSubshapes(Defeaturing_1, model, Part_1_doc) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Defeaturing_1, 1) model.testNbSubResults(Defeaturing_1, [2]) diff --git a/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid2.py b/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid2.py index c73eeb95b..96522bc8a 100644 --- a/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid2.py +++ b/src/FeaturesPlugin/Test/TestDefeaturing_OnCompsolid2.py @@ -61,7 +61,7 @@ Defeaturing_1 = model.addDefeaturing(Part_1_doc, Defeaturing_1_objects) model.testHaveNamingSubshapes(Defeaturing_1, model, Part_1_doc) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Defeaturing_1, 1) model.testNbSubResults(Defeaturing_1, [2]) diff --git a/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid1.py b/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid1.py index 225ee3474..2b540b229 100644 --- a/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid1.py +++ b/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid1.py @@ -43,7 +43,7 @@ Defeaturing_1 = model.addDefeaturing( model.testHaveNamingSubshapes(Defeaturing_1, model, Part_1_doc) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Defeaturing_1, 1) model.testNbSubResults(Defeaturing_1, [0]) diff --git a/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid2.py b/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid2.py index 61bf2d4f3..4703b237c 100644 --- a/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid2.py +++ b/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid2.py @@ -163,7 +163,7 @@ Defeaturing_1 = model.addDefeaturing( model.testHaveNamingSubshapes(Defeaturing_1, model, Part_1_doc) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Defeaturing_1, 1) model.testNbSubResults(Defeaturing_1, [0]) diff --git a/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid3.py b/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid3.py index 7e235ce29..6076ea024 100644 --- a/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid3.py +++ b/src/FeaturesPlugin/Test/TestDefeaturing_OnSolid3.py @@ -167,7 +167,7 @@ Defeaturing_1 = model.addDefeaturing( model.testHaveNamingSubshapes(Defeaturing_1, model, Part_1_doc) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Defeaturing_1, 1) model.testNbSubResults(Defeaturing_1, [0]) diff --git a/src/FeaturesPlugin/Test/TestExtrusionCut.py b/src/FeaturesPlugin/Test/TestExtrusionCut.py index 8bb63550e..c10711b60 100644 --- a/src/FeaturesPlugin/Test/TestExtrusionCut.py +++ b/src/FeaturesPlugin/Test/TestExtrusionCut.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestExtrusionFuse.py b/src/FeaturesPlugin/Test/TestExtrusionFuse.py index 55be2dde6..69469a434 100644 --- a/src/FeaturesPlugin/Test/TestExtrusionFuse.py +++ b/src/FeaturesPlugin/Test/TestExtrusionFuse.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces01.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces01.py index 31ec504e8..ea185a2c4 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces01.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces01.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces02.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces02.py index bd30e68ee..4870372aa 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces02.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces02.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces03.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces03.py index 5f52c56b1..f9010b288 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces03.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces03.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces04.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces04.py index aee2544c1..9cb43d1ef 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces04.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces04.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces05.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces05.py index 33c0543bc..325ea1237 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces05.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces05.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces06.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces06.py index 4b1a779dc..a36e39dbb 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces06.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces06.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces07.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces07.py index 0f36f255f..379b55fd5 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces07.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces07.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces08.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces08.py index b32a3737f..7467026e0 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces08.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces08.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces09.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces09.py index 781dec0f7..47d1b3d5b 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces09.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces09.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces10.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces10.py index 44dda324c..ac93fafa1 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces10.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces10.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces11.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces11.py index 8466dd433..5169f7d64 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces11.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces11.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces12.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces12.py index 25f1c28b3..099ee9c77 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces12.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces12.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces13.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces13.py index 3af59a788..51dfaa07c 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces13.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces13.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces14.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces14.py index f3342101d..95d7424d3 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces14.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces14.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces15.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces15.py index 78aed6219..4aa8002d5 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces15.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces15.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces16.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces16.py index 748d050d0..12569bd8c 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces16.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces16.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces17.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces17.py index d14ebb2d1..d887cc9ff 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces17.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces17.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces18.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces18.py index 3ba6d333b..25c190108 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces18.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces18.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces19.py b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces19.py index e65228f02..4f06593cb 100644 --- a/src/FeaturesPlugin/Test/TestExtrusion_ByFaces19.py +++ b/src/FeaturesPlugin/Test/TestExtrusion_ByFaces19.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_1.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_1.py index 9012d421f..f791a7c3f 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_1.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_2.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_2.py index 457dc4612..aca5d3776 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_2.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_3.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_3.py index b853ee5b1..aba7b9b88 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_3.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_4.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_4.py index ee7b9cc5f..870ebc103 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_4.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_5.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_5.py index ef785a66e..77a45421d 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_5.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_6.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_6.py index 11f13667d..2f04c8ae2 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_6.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_6.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_7.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_7.py index c9097d1d9..2d2db8af9 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_7.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_7.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_8.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_8.py index 7bd39f89f..ad126f114 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_8.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_8.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_9.py b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_9.py index a437c673c..e0bceaacb 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Vertices_9.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Vertices_9.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Wire_1.py b/src/FeaturesPlugin/Test/TestFillet1D_Wire_1.py index ac90f4b83..73d199633 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Wire_1.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Wire_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Wire_2.py b/src/FeaturesPlugin/Test/TestFillet1D_Wire_2.py index 949822a90..8292ff2cd 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Wire_2.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Wire_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Wire_3.py b/src/FeaturesPlugin/Test/TestFillet1D_Wire_3.py index 592ca4cc7..c697213c6 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Wire_3.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Wire_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Wire_4.py b/src/FeaturesPlugin/Test/TestFillet1D_Wire_4.py index 751e694ee..9fd6b9791 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Wire_4.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Wire_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFillet1D_Wire_5.py b/src/FeaturesPlugin/Test/TestFillet1D_Wire_5.py index b1bf0d8de..140f1eaba 100644 --- a/src/FeaturesPlugin/Test/TestFillet1D_Wire_5.py +++ b/src/FeaturesPlugin/Test/TestFillet1D_Wire_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestFusionFaces32443.py b/src/FeaturesPlugin/Test/TestFusionFaces32443.py index 76446c81c..4aa692133 100644 --- a/src/FeaturesPlugin/Test/TestFusionFaces32443.py +++ b/src/FeaturesPlugin/Test/TestFusionFaces32443.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point # Create document model.begin() diff --git a/src/FeaturesPlugin/Test/TestGeometryCalculation.py b/src/FeaturesPlugin/Test/TestGeometryCalculation.py index 8c310a880..c3f77c524 100644 --- a/src/FeaturesPlugin/Test/TestGeometryCalculation.py +++ b/src/FeaturesPlugin/Test/TestGeometryCalculation.py @@ -45,7 +45,7 @@ def test_Geometry_Calculation(): partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() - Import_1 = model.addImport(Part_1_doc, file_path) + model.addImport(Part_1_doc, file_path) model.do() myDelta = 1e-6 diff --git a/src/FeaturesPlugin/Test/TestIntersection.py b/src/FeaturesPlugin/Test/TestIntersection.py index 16df3f511..c0315a8fd 100644 --- a/src/FeaturesPlugin/Test/TestIntersection.py +++ b/src/FeaturesPlugin/Test/TestIntersection.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_1.py b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_1.py index 2a1a58f7a..f7a9327b1 100644 --- a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_1.py +++ b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_1.py @@ -57,7 +57,7 @@ Intersection_1 = model.addIntersection( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Intersection_1, 1) model.testNbSubResults(Intersection_1, [6]) diff --git a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_2.py index bccaecf7b..ebc7d4873 100644 --- a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_2.py +++ b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v0_2.py @@ -54,7 +54,7 @@ Intersection_1 = model.addIntersection( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Intersection_1, 1) model.testNbSubResults(Intersection_1, [8]) diff --git a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_1.py b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_1.py index 50b3d01b4..23048544b 100644 --- a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_1.py +++ b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_1.py @@ -60,7 +60,7 @@ Intersection_1 = model.addIntersection( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Intersection_1, 1) model.testNbSubResults(Intersection_1, [2]) diff --git a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_2.py b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_2.py index 5b748b166..17810d69f 100644 --- a/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_2.py +++ b/src/FeaturesPlugin/Test/TestIntersection_MultiLevelCompound_v95_2.py @@ -57,7 +57,7 @@ Intersection_1 = model.addIntersection( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Intersection_1, 1) model.testNbSubResults(Intersection_1, [3]) diff --git a/src/FeaturesPlugin/Test/TestMeasurementAngle.py b/src/FeaturesPlugin/Test/TestMeasurementAngle.py index 2ba849b51..79d2cd331 100644 --- a/src/FeaturesPlugin/Test/TestMeasurementAngle.py +++ b/src/FeaturesPlugin/Test/TestMeasurementAngle.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestMeasurementAngle3Points.py b/src/FeaturesPlugin/Test/TestMeasurementAngle3Points.py index ebe3df0cc..21107090f 100644 --- a/src/FeaturesPlugin/Test/TestMeasurementAngle3Points.py +++ b/src/FeaturesPlugin/Test/TestMeasurementAngle3Points.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestMultiRotation_ErrorMsg.py b/src/FeaturesPlugin/Test/TestMultiRotation_ErrorMsg.py index bc12494dd..61f863813 100644 --- a/src/FeaturesPlugin/Test/TestMultiRotation_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestMultiRotation_ErrorMsg.py @@ -18,7 +18,7 @@ # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestMultiTranslation_ErrorMsg.py b/src/FeaturesPlugin/Test/TestMultiTranslation_ErrorMsg.py index 3e75d0458..6220a67d2 100644 --- a/src/FeaturesPlugin/Test/TestMultiTranslation_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestMultiTranslation_ErrorMsg.py @@ -18,7 +18,7 @@ # -from ModelAPI import * +from ModelAPI import ModelAPI_Session, modelAPI_ResultPart aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestNormalToFace.py b/src/FeaturesPlugin/Test/TestNormalToFace.py index 769c39ec3..ccc3c6abe 100644 --- a/src/FeaturesPlugin/Test/TestNormalToFace.py +++ b/src/FeaturesPlugin/Test/TestNormalToFace.py @@ -25,10 +25,7 @@ # ========================================================================= -import os -import math - -from ModelAPI import * +from ModelAPI import modelAPI_ResultConstruction from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPartition.py b/src/FeaturesPlugin/Test/TestPartition.py index 56ee86884..db88dbfb1 100644 --- a/src/FeaturesPlugin/Test/TestPartition.py +++ b/src/FeaturesPlugin/Test/TestPartition.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestPartitionArgsUpdate.py b/src/FeaturesPlugin/Test/TestPartitionArgsUpdate.py index a15a49adf..22cb2f534 100644 --- a/src/FeaturesPlugin/Test/TestPartitionArgsUpdate.py +++ b/src/FeaturesPlugin/Test/TestPartitionArgsUpdate.py @@ -656,7 +656,7 @@ Partition_1.setBase(Partition_1_objects) model.end() # check all groups are valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() assert Part_1_doc.size("Groups") == 3 diff --git a/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py b/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py index c92879b88..3ad69bdd4 100644 --- a/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py +++ b/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid1.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid1.py index 150c467c6..2cee2b4e1 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid1.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid2.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid2.py index 4a6ca1cf1..41300b3d1 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid2.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid3.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid3.py index 5785e7067..cea1370e0 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid3.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithCompSolid3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace1.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace1.py index fafc9678f..a502d8121 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace1.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace2.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace2.py index ca097178b..47feae8d6 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace2.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace3.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace3.py index 09b5d427a..08d8ebcf0 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace3.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace4.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace4.py index 7d75934a6..806e273b5 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace4.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace5.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace5.py index 73a2b896e..8fbe16e1e 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace5.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithFace5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane1.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane1.py index 16fc05ce2..6a0ffd98a 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane1.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane2.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane2.py index 10d74e444..3d956417c 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane2.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane3.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane3.py index 3380b0d92..8e32da5f0 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane3.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane4.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane4.py index 1516b38ea..a70b9e53a 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane4.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane5.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane5.py index ab9ea67a7..8a809bb49 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane5.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithPlane5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid1.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid1.py index b22afaa2b..38bf20e86 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid1.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid2.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid2.py index 5dc5fcbdf..43b82f056 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid2.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid3.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid3.py index 3600a25d9..2de585a29 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid3.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid4.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid4.py index 0825829ee..a4592e0f7 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid4.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid5.py b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid5.py index 119f7d526..87bed8069 100644 --- a/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid5.py +++ b/src/FeaturesPlugin/Test/TestPartitionSubCompsolidWithSolid5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartition_ErrorMsg.py b/src/FeaturesPlugin/Test/TestPartition_ErrorMsg.py index f3f2fd598..50161ff04 100644 --- a/src/FeaturesPlugin/Test/TestPartition_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestPartition_ErrorMsg.py @@ -58,7 +58,7 @@ Part_1_doc.removeFeature(Partition_1.feature()) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_1.py b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_1.py index a8a5c7187..5e3e674ba 100644 --- a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_1.py +++ b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_2.py b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_2.py index 7ce53c29d..21f126344 100644 --- a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_2.py +++ b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_3.py b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_3.py index 3f2c73d14..f1139fb51 100644 --- a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_3.py +++ b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v0_3.py @@ -18,7 +18,7 @@ # from GeomAPI import GeomAPI_Shape -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_1.py b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_1.py index 33d4cb763..c01ba1c51 100644 --- a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_1.py +++ b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_2.py b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_2.py index ecab5bc48..3f4ca0a7f 100644 --- a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_2.py +++ b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_3.py b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_3.py index f91e352e3..209824142 100644 --- a/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_3.py +++ b/src/FeaturesPlugin/Test/TestPartition_MultiLevelCompound_v20190506_3.py @@ -18,7 +18,7 @@ # from GeomAPI import GeomAPI_Shape -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestPipe_DoNotMovePath.py b/src/FeaturesPlugin/Test/TestPipe_DoNotMovePath.py index bde010059..0550dbb98 100644 --- a/src/FeaturesPlugin/Test/TestPipe_DoNotMovePath.py +++ b/src/FeaturesPlugin/Test/TestPipe_DoNotMovePath.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model model.begin() diff --git a/src/FeaturesPlugin/Test/TestPlacement_Complex.py b/src/FeaturesPlugin/Test/TestPlacement_Complex.py index 3b07ca85a..88c5d44c0 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_Complex.py +++ b/src/FeaturesPlugin/Test/TestPlacement_Complex.py @@ -123,7 +123,7 @@ Placement_2 = model.addPlacement( model.do() model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape # check middle point of the placed solid shape = Placement_2.results()[0].resultSubShapePair()[0].shape() diff --git a/src/FeaturesPlugin/Test/TestPlacement_Edge_Edge.py b/src/FeaturesPlugin/Test/TestPlacement_Edge_Edge.py index f7217a64b..103d88759 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_Edge_Edge.py +++ b/src/FeaturesPlugin/Test/TestPlacement_Edge_Edge.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestPlacement_Edge_Vertex.py b/src/FeaturesPlugin/Test/TestPlacement_Edge_Vertex.py index 2fafbfa2b..6bc6e8f95 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_Edge_Vertex.py +++ b/src/FeaturesPlugin/Test/TestPlacement_Edge_Vertex.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestPlacement_ErrorMsg.py b/src/FeaturesPlugin/Test/TestPlacement_ErrorMsg.py index 17fc9310d..891b8546b 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestPlacement_ErrorMsg.py @@ -37,7 +37,7 @@ Extrusion_1 = model.addExtrusion( model.do() model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session, featureToCompositeFeature aSession = ModelAPI_Session.get() diff --git a/src/FeaturesPlugin/Test/TestPlacement_Face_Edge.py b/src/FeaturesPlugin/Test/TestPlacement_Face_Edge.py index 70dfc2bfd..8dceb6fb9 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_Face_Edge.py +++ b/src/FeaturesPlugin/Test/TestPlacement_Face_Edge.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestPlacement_Face_Face.py b/src/FeaturesPlugin/Test/TestPlacement_Face_Face.py index a32eede69..91a1e2817 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_Face_Face.py +++ b/src/FeaturesPlugin/Test/TestPlacement_Face_Face.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestPlacement_Face_Vertex.py b/src/FeaturesPlugin/Test/TestPlacement_Face_Vertex.py index f5ec83511..3388d3fdf 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_Face_Vertex.py +++ b/src/FeaturesPlugin/Test/TestPlacement_Face_Vertex.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_5.py b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_5.py index 1abeda39b..b749cf8e9 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_5.py +++ b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_6.py b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_6.py index 99372f6e8..6b5dc7018 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_6.py +++ b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v0_6.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_5.py b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_5.py index 7dc2b1b0a..dfc845ec3 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_5.py +++ b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_6.py b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_6.py index 4c88a3772..6ea0db2c8 100644 --- a/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_6.py +++ b/src/FeaturesPlugin/Test/TestPlacement_MultiLevelCompound_v95_6.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPointCloud.py b/src/FeaturesPlugin/Test/TestPointCloud.py index f33ffab70..f9e322109 100644 --- a/src/FeaturesPlugin/Test/TestPointCloud.py +++ b/src/FeaturesPlugin/Test/TestPointCloud.py @@ -22,7 +22,7 @@ """ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestPointCoordinates.py b/src/FeaturesPlugin/Test/TestPointCoordinates.py index bc47addb8..eb2dccd88 100644 --- a/src/FeaturesPlugin/Test/TestPointCoordinates.py +++ b/src/FeaturesPlugin/Test/TestPointCoordinates.py @@ -41,7 +41,7 @@ def test_point_coordinates(): partSet = model.moduleDocument() Part_1 = model.addPart(partSet) Part_1_doc = Part_1.document() - Import_1 = model.addImport(Part_1_doc, file_path) + model.addImport(Part_1_doc, file_path) model.do() myDelta = 1e-6 diff --git a/src/FeaturesPlugin/Test/TestRemoveResultsBody.py b/src/FeaturesPlugin/Test/TestRemoveResultsBody.py index 30677b141..0d1aaa077 100644 --- a/src/FeaturesPlugin/Test/TestRemoveResultsBody.py +++ b/src/FeaturesPlugin/Test/TestRemoveResultsBody.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_ResultBody, ModelAPI_ResultConstruction, removeResults model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRemoveResultsConstruction.py b/src/FeaturesPlugin/Test/TestRemoveResultsConstruction.py index 6ec8e8124..3669d4b37 100644 --- a/src/FeaturesPlugin/Test/TestRemoveResultsConstruction.py +++ b/src/FeaturesPlugin/Test/TestRemoveResultsConstruction.py @@ -39,7 +39,7 @@ RemoveResults_1 = model.addRemoveResults( model.end() # check the number of bodies = 1, number of construction = 0 -from ModelAPI import * +from ModelAPI import ModelAPI_ResultBody, ModelAPI_ResultConstruction assert Part_1.document().size(ModelAPI_ResultConstruction.group()) == 0 assert Part_1.document().size(ModelAPI_ResultBody.group()) == 1 diff --git a/src/FeaturesPlugin/Test/TestRemoveResultsPart.py b/src/FeaturesPlugin/Test/TestRemoveResultsPart.py index b756f6c52..1309d9a51 100644 --- a/src/FeaturesPlugin/Test/TestRemoveResultsPart.py +++ b/src/FeaturesPlugin/Test/TestRemoveResultsPart.py @@ -28,6 +28,6 @@ RemoveResults_1 = model.addRemoveResults(partSet, [model.selection("SHAPE", "Par model.end() # check the number of parts = 0 -from ModelAPI import * +from ModelAPI import ModelAPI_ResultPart assert Part_1.document().size(ModelAPI_ResultPart.group()) == 0 diff --git a/src/FeaturesPlugin/Test/TestRemoveSubShapes.py b/src/FeaturesPlugin/Test/TestRemoveSubShapes.py index 7730e3ca0..736f37732 100644 --- a/src/FeaturesPlugin/Test/TestRemoveSubShapes.py +++ b/src/FeaturesPlugin/Test/TestRemoveSubShapes.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRemoveSubShapes4.py b/src/FeaturesPlugin/Test/TestRemoveSubShapes4.py index 09927c96e..1e549b0ec 100644 --- a/src/FeaturesPlugin/Test/TestRemoveSubShapes4.py +++ b/src/FeaturesPlugin/Test/TestRemoveSubShapes4.py @@ -19,7 +19,7 @@ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRemoveSubShapes5.py b/src/FeaturesPlugin/Test/TestRemoveSubShapes5.py index 2d1d45c52..b9c34ae3a 100644 --- a/src/FeaturesPlugin/Test/TestRemoveSubShapes5.py +++ b/src/FeaturesPlugin/Test/TestRemoveSubShapes5.py @@ -19,7 +19,7 @@ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRemoveSubShapes6.py b/src/FeaturesPlugin/Test/TestRemoveSubShapes6.py index 6fd6fba86..e3500cb95 100644 --- a/src/FeaturesPlugin/Test/TestRemoveSubShapes6.py +++ b/src/FeaturesPlugin/Test/TestRemoveSubShapes6.py @@ -19,7 +19,7 @@ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRevolution.py b/src/FeaturesPlugin/Test/TestRevolution.py index 6baeae30c..b980d1026 100644 --- a/src/FeaturesPlugin/Test/TestRevolution.py +++ b/src/FeaturesPlugin/Test/TestRevolution.py @@ -50,7 +50,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRevolutionCut.py b/src/FeaturesPlugin/Test/TestRevolutionCut.py index da4ef313d..50e7d7127 100644 --- a/src/FeaturesPlugin/Test/TestRevolutionCut.py +++ b/src/FeaturesPlugin/Test/TestRevolutionCut.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestRevolutionFuse.py b/src/FeaturesPlugin/Test/TestRevolutionFuse.py index cc335868b..2ab408043 100644 --- a/src/FeaturesPlugin/Test/TestRevolutionFuse.py +++ b/src/FeaturesPlugin/Test/TestRevolutionFuse.py @@ -52,7 +52,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math __updated__ = "2014-12-16" diff --git a/src/FeaturesPlugin/Test/TestRotation.py b/src/FeaturesPlugin/Test/TestRotation.py index 7eda1170f..f6a4bb0df 100644 --- a/src/FeaturesPlugin/Test/TestRotation.py +++ b/src/FeaturesPlugin/Test/TestRotation.py @@ -38,7 +38,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRotation_ErrorMsg.py b/src/FeaturesPlugin/Test/TestRotation_ErrorMsg.py index 79f7041d0..b26bb8c9c 100644 --- a/src/FeaturesPlugin/Test/TestRotation_ErrorMsg.py +++ b/src/FeaturesPlugin/Test/TestRotation_ErrorMsg.py @@ -26,7 +26,7 @@ Part_1_doc = Part_1.document() Box_1 = model.addBox(Part_1_doc, 10, 10, 10) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session, featureToCompositeFeature aSession = ModelAPI_Session.get() diff --git a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_3.py b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_3.py index 87ae0b18e..984a1a04f 100644 --- a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_3.py +++ b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Ax1, GeomAPI_Dir, GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_4.py b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_4.py index 455d3310d..f7463418b 100644 --- a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_4.py +++ b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v0_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Ax1, GeomAPI_Dir, GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_3.py b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_3.py index e4ad4a739..1e8aeea5f 100644 --- a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_3.py +++ b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Ax1, GeomAPI_Dir, GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_4.py b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_4.py index 65195594f..11169b272 100644 --- a/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_4.py +++ b/src/FeaturesPlugin/Test/TestRotation_MultiLevelCompound_v95_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Ax1, GeomAPI_Dir, GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_3.py b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_3.py index ca909f348..f06446ec4 100644 --- a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_3.py +++ b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_4.py b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_4.py index 62cad73a5..4345ec00e 100644 --- a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_4.py +++ b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v0_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_3.py b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_3.py index 09a6360ee..67e1d732b 100644 --- a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_3.py +++ b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_4.py b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_4.py index 7e16cc6f3..4291ba8e1 100644 --- a/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_4.py +++ b/src/FeaturesPlugin/Test/TestScale_MultiLevelCompound_v95_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestSewing_Groups.py b/src/FeaturesPlugin/Test/TestSewing_Groups.py index 5473978cd..790b619c1 100644 --- a/src/FeaturesPlugin/Test/TestSewing_Groups.py +++ b/src/FeaturesPlugin/Test/TestSewing_Groups.py @@ -1,9 +1,8 @@ -import sys import salome salome.salome_init() -from SketchAPI import * +from SketchAPI import SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitCompFaceSolid.py b/src/FeaturesPlugin/Test/TestSplitCompFaceSolid.py index b8eb32d3f..d47fa7e66 100644 --- a/src/FeaturesPlugin/Test/TestSplitCompFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitCompFaceSolid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitEdgeShell.py b/src/FeaturesPlugin/Test/TestSplitEdgeShell.py index dca84035e..49c4d9c9f 100644 --- a/src/FeaturesPlugin/Test/TestSplitEdgeShell.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeShell.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitEdgeSolidIntersected.py b/src/FeaturesPlugin/Test/TestSplitEdgeSolidIntersected.py index 6afb09597..a6304c99d 100644 --- a/src/FeaturesPlugin/Test/TestSplitEdgeSolidIntersected.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeSolidIntersected.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitEdgeVertex.py b/src/FeaturesPlugin/Test/TestSplitEdgeVertex.py index d3be815e7..4c35f76db 100644 --- a/src/FeaturesPlugin/Test/TestSplitEdgeVertex.py +++ b/src/FeaturesPlugin/Test/TestSplitEdgeVertex.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitFaceShell.py b/src/FeaturesPlugin/Test/TestSplitFaceShell.py index 4a0294658..4a8bfbc80 100644 --- a/src/FeaturesPlugin/Test/TestSplitFaceShell.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceShell.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitFaceSolid.py b/src/FeaturesPlugin/Test/TestSplitFaceSolid.py index 4cbce9397..3ec592f85 100644 --- a/src/FeaturesPlugin/Test/TestSplitFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitFaceSolid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitShellConstrPlane.py b/src/FeaturesPlugin/Test/TestSplitShellConstrPlane.py index 1953f7b0d..4cb3af73f 100644 --- a/src/FeaturesPlugin/Test/TestSplitShellConstrPlane.py +++ b/src/FeaturesPlugin/Test/TestSplitShellConstrPlane.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitShellEdge.py b/src/FeaturesPlugin/Test/TestSplitShellEdge.py index 889f054bd..b964a30c9 100644 --- a/src/FeaturesPlugin/Test/TestSplitShellEdge.py +++ b/src/FeaturesPlugin/Test/TestSplitShellEdge.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitShellFace.py b/src/FeaturesPlugin/Test/TestSplitShellFace.py index 23183f92d..63cd994a4 100644 --- a/src/FeaturesPlugin/Test/TestSplitShellFace.py +++ b/src/FeaturesPlugin/Test/TestSplitShellFace.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitShellShell.py b/src/FeaturesPlugin/Test/TestSplitShellShell.py index cdb800722..c4717319e 100644 --- a/src/FeaturesPlugin/Test/TestSplitShellShell.py +++ b/src/FeaturesPlugin/Test/TestSplitShellShell.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitShellSolid.py b/src/FeaturesPlugin/Test/TestSplitShellSolid.py index 47844a8e1..6d968111a 100644 --- a/src/FeaturesPlugin/Test/TestSplitShellSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitShellSolid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitShellVertex.py b/src/FeaturesPlugin/Test/TestSplitShellVertex.py index dc8c9752e..c8bf20bd0 100644 --- a/src/FeaturesPlugin/Test/TestSplitShellVertex.py +++ b/src/FeaturesPlugin/Test/TestSplitShellVertex.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitShellWire.py b/src/FeaturesPlugin/Test/TestSplitShellWire.py index 1fa26cb6a..fdb406ea8 100644 --- a/src/FeaturesPlugin/Test/TestSplitShellWire.py +++ b/src/FeaturesPlugin/Test/TestSplitShellWire.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitSolidCompFace.py b/src/FeaturesPlugin/Test/TestSplitSolidCompFace.py index 7f532a162..da773200a 100644 --- a/src/FeaturesPlugin/Test/TestSplitSolidCompFace.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidCompFace.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitSolidCompShell.py b/src/FeaturesPlugin/Test/TestSplitSolidCompShell.py index ed039734d..fd5ba9cea 100644 --- a/src/FeaturesPlugin/Test/TestSplitSolidCompShell.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidCompShell.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitSolidFace.py b/src/FeaturesPlugin/Test/TestSplitSolidFace.py index 82a1c287e..5dc6b7521 100644 --- a/src/FeaturesPlugin/Test/TestSplitSolidFace.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidFace.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitSolidShell.py b/src/FeaturesPlugin/Test/TestSplitSolidShell.py index 23f382cf4..ed5c94681 100644 --- a/src/FeaturesPlugin/Test/TestSplitSolidShell.py +++ b/src/FeaturesPlugin/Test/TestSplitSolidShell.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitWireShell.py b/src/FeaturesPlugin/Test/TestSplitWireShell.py index 41d656132..4e29bd845 100644 --- a/src/FeaturesPlugin/Test/TestSplitWireShell.py +++ b/src/FeaturesPlugin/Test/TestSplitWireShell.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitWireSolid.py b/src/FeaturesPlugin/Test/TestSplitWireSolid.py index 5e5b2c7aa..5da594ee5 100644 --- a/src/FeaturesPlugin/Test/TestSplitWireSolid.py +++ b/src/FeaturesPlugin/Test/TestSplitWireSolid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSplitWireVertex.py b/src/FeaturesPlugin/Test/TestSplitWireVertex.py index 2ee797307..44703ded1 100644 --- a/src/FeaturesPlugin/Test/TestSplitWireVertex.py +++ b/src/FeaturesPlugin/Test/TestSplitWireVertex.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_4.py b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_4.py index 2aff947ad..7831f4f92 100644 --- a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_4.py +++ b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_5.py b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_5.py index ab4e694b6..177750e0e 100644 --- a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_5.py +++ b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v0_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_1.py b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_1.py index 6d15c7cb3..49d826778 100644 --- a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_1.py +++ b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_1.py @@ -22,7 +22,6 @@ from salome.shaper import model from GeomAPI import * from SketchAPI import * -import math model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_2.py b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_2.py index 9115a96dd..a17acf1f7 100644 --- a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_2.py +++ b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_2.py @@ -22,7 +22,6 @@ from salome.shaper import model from GeomAPI import * from SketchAPI import * -import math model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_3.py b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_3.py index b5b1f7cf3..f061e552f 100644 --- a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_3.py +++ b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_3.py @@ -22,7 +22,6 @@ from salome.shaper import model from GeomAPI import * from SketchAPI import * -import math model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_4.py b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_4.py index f0c0b698e..52db24566 100644 --- a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_4.py +++ b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_5.py b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_5.py index d646fe6fc..0927a55ed 100644 --- a/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_5.py +++ b/src/FeaturesPlugin/Test/TestSymmetry_MultiLevelCompound_v95_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestTranslation.py b/src/FeaturesPlugin/Test/TestTranslation.py index 603e834b1..e45c77181 100644 --- a/src/FeaturesPlugin/Test/TestTranslation.py +++ b/src/FeaturesPlugin/Test/TestTranslation.py @@ -38,7 +38,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_4.py b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_4.py index fb68d3d14..d4b33013c 100644 --- a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_4.py +++ b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_5.py b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_5.py index 855f4f3d6..c50359926 100644 --- a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_5.py +++ b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v0_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_4.py b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_4.py index 75f1fc3d6..73e4f26f4 100644 --- a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_4.py +++ b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_5.py b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_5.py index 633e3cca8..d72b55a98 100644 --- a/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_5.py +++ b/src/FeaturesPlugin/Test/TestTranslation_MultiLevelCompound_v95_5.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt, GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestUnion.py b/src/FeaturesPlugin/Test/TestUnion.py index 974478b38..239a0f889 100644 --- a/src/FeaturesPlugin/Test/TestUnion.py +++ b/src/FeaturesPlugin/Test/TestUnion.py @@ -24,7 +24,6 @@ from ModelAPI import * from GeomDataAPI import * from GeomAlgoAPI import * from GeomAPI import * -import math aSession = ModelAPI_Session.get() aDocument = aSession.moduleDocument() diff --git a/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v0.py b/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v0.py index d7b3c5ce2..c939acc8e 100644 --- a/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v0.py +++ b/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v0.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v20190506.py b/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v20190506.py index 5255fa1e2..8864cac04 100644 --- a/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v20190506.py +++ b/src/FeaturesPlugin/Test/TestUnion_MultiLevelCompound_v20190506.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FeaturesPlugin/doc/examples/check_shared_faces.py b/src/FeaturesPlugin/doc/examples/check_shared_faces.py index 742743f78..3b4a372a5 100644 --- a/src/FeaturesPlugin/doc/examples/check_shared_faces.py +++ b/src/FeaturesPlugin/doc/examples/check_shared_faces.py @@ -1,5 +1,4 @@ from salome.shaper import model -import os model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/doc/examples/create_bounding_box.py b/src/FeaturesPlugin/doc/examples/create_bounding_box.py index e505c8719..3b815e234 100644 --- a/src/FeaturesPlugin/doc/examples/create_bounding_box.py +++ b/src/FeaturesPlugin/doc/examples/create_bounding_box.py @@ -1,5 +1,4 @@ from salome.shaper import model -import os model.begin() partSet = model.moduleDocument() diff --git a/src/FeaturesPlugin/doc/examples/create_normal_to_face.py b/src/FeaturesPlugin/doc/examples/create_normal_to_face.py index f212f2ae1..d8b2387b3 100644 --- a/src/FeaturesPlugin/doc/examples/create_normal_to_face.py +++ b/src/FeaturesPlugin/doc/examples/create_normal_to_face.py @@ -1,5 +1,4 @@ from salome.shaper import model -import os ### Create a Box model.begin() diff --git a/src/FeaturesPlugin/doc/examples/create_normal_to_face_at_vertex.py b/src/FeaturesPlugin/doc/examples/create_normal_to_face_at_vertex.py index 92c5e6069..bc4ec687b 100644 --- a/src/FeaturesPlugin/doc/examples/create_normal_to_face_at_vertex.py +++ b/src/FeaturesPlugin/doc/examples/create_normal_to_face_at_vertex.py @@ -1,5 +1,4 @@ from salome.shaper import model -import os model.begin() Box_1 = model.addBox(Part_1_doc, 10, 10, 10) diff --git a/src/FeaturesPlugin/doc/examples/fuse_faces.py b/src/FeaturesPlugin/doc/examples/fuse_faces.py index 1b0d3b89b..9b6da1e5c 100644 --- a/src/FeaturesPlugin/doc/examples/fuse_faces.py +++ b/src/FeaturesPlugin/doc/examples/fuse_faces.py @@ -1,4 +1,4 @@ -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/doc/examples/geometry_calculation.py b/src/FeaturesPlugin/doc/examples/geometry_calculation.py index ac94538ac..59e8c4fc7 100644 --- a/src/FeaturesPlugin/doc/examples/geometry_calculation.py +++ b/src/FeaturesPlugin/doc/examples/geometry_calculation.py @@ -1,4 +1,3 @@ -import os from salome.shaper import model model.begin() diff --git a/src/FeaturesPlugin/doc/examples/pipe_simple.py b/src/FeaturesPlugin/doc/examples/pipe_simple.py index 8efcf50d9..90c26acbe 100644 --- a/src/FeaturesPlugin/doc/examples/pipe_simple.py +++ b/src/FeaturesPlugin/doc/examples/pipe_simple.py @@ -1,4 +1,4 @@ -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FeaturesPlugin/doc/examples/point_coordinates.py b/src/FeaturesPlugin/doc/examples/point_coordinates.py index 50e84fbec..66614c5e9 100644 --- a/src/FeaturesPlugin/doc/examples/point_coordinates.py +++ b/src/FeaturesPlugin/doc/examples/point_coordinates.py @@ -1,4 +1,3 @@ -import os from salome.shaper import model model.begin() diff --git a/src/FiltersPlugin/Test/Test19190.py b/src/FiltersPlugin/Test/Test19190.py index c8e9cebfc..e0129b08a 100644 --- a/src/FiltersPlugin/Test/Test19190.py +++ b/src/FiltersPlugin/Test/Test19190.py @@ -112,7 +112,7 @@ Filters = model.filters( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.testNbResults(Fuse_1, 1) model.testNbSubResults(Fuse_1, [2]) diff --git a/src/FiltersPlugin/Test/Test2946.py b/src/FiltersPlugin/Test/Test2946.py index 418550439..21e12081c 100644 --- a/src/FiltersPlugin/Test/Test2946.py +++ b/src/FiltersPlugin/Test/Test2946.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_BelongsTo.py b/src/FiltersPlugin/Test/TestFilter_BelongsTo.py index ed621455c..923b52963 100644 --- a/src/FiltersPlugin/Test/TestFilter_BelongsTo.py +++ b/src/FiltersPlugin/Test/TestFilter_BelongsTo.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_BelongsTo_Exclude.py b/src/FiltersPlugin/Test/TestFilter_BelongsTo_Exclude.py index 93c203be9..4202a333a 100644 --- a/src/FiltersPlugin/Test/TestFilter_BelongsTo_Exclude.py +++ b/src/FiltersPlugin/Test/TestFilter_BelongsTo_Exclude.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_ExternalFaces1.py b/src/FiltersPlugin/Test/TestFilter_ExternalFaces1.py index 2909bf8b8..70d5e92b9 100644 --- a/src/FiltersPlugin/Test/TestFilter_ExternalFaces1.py +++ b/src/FiltersPlugin/Test/TestFilter_ExternalFaces1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude1.py b/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude1.py index 30c46ab81..0fc382f80 100644 --- a/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude1.py +++ b/src/FiltersPlugin/Test/TestFilter_ExternalFaces_Exclude1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Edge1.py b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Edge1.py index e1ab15872..c2c464480 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Edge1.py +++ b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Edge1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Edge1.py b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Edge1.py index f76ffb214..4513651c5 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Edge1.py +++ b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Edge1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face1.py b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face1.py index 490f4da64..a4e36f007 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face1.py +++ b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face4.py b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face4.py index 02e9c30d8..21d86381a 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face4.py +++ b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Exclude_Face4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face1.py b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face1.py index f285c35bc..e1e880b59 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face1.py +++ b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face4.py b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face4.py index 8364a7bc3..c520beeea 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face4.py +++ b/src/FiltersPlugin/Test/TestFilter_OnGeometry_Face4.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Face.py b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Face.py index 1876be61e..75387f81f 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Face.py +++ b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Face.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model model.begin() diff --git a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Plane.py b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Plane.py index 7984b5163..af87adc98 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Plane.py +++ b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Exclude_Plane.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model model.begin() diff --git a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Face.py b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Face.py index fe4be594e..79e3d8919 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Face.py +++ b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Face.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model model.begin() diff --git a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Plane.py b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Plane.py index 275159ffb..f53c19953 100644 --- a/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Plane.py +++ b/src/FiltersPlugin/Test/TestFilter_OnPlaneSide_Plane.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model model.begin() diff --git a/src/FiltersPlugin/Test/TestFilter_OppositeToEdge.py b/src/FiltersPlugin/Test/TestFilter_OppositeToEdge.py index c9f13198b..4094eddb3 100644 --- a/src/FiltersPlugin/Test/TestFilter_OppositeToEdge.py +++ b/src/FiltersPlugin/Test/TestFilter_OppositeToEdge.py @@ -68,7 +68,7 @@ Filters = model.filters( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer Reference = {} # Faces are not applicable diff --git a/src/FiltersPlugin/Test/TestFilter_OppositeToEdge_Exclude.py b/src/FiltersPlugin/Test/TestFilter_OppositeToEdge_Exclude.py index ad160cf3d..90f32a1a8 100644 --- a/src/FiltersPlugin/Test/TestFilter_OppositeToEdge_Exclude.py +++ b/src/FiltersPlugin/Test/TestFilter_OppositeToEdge_Exclude.py @@ -69,7 +69,7 @@ Filters = model.filters( ) model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer Reference = {} # Faces are not applicable diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_In.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_In.py index 40b954ca7..e1763d47d 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_In.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_In.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_InAndOn.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_InAndOn.py index 6c1889b51..54fa0c6d0 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_InAndOn.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_InAndOn.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_NotOn.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_NotOn.py index 12f67e40d..cfb75df87 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_NotOn.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_NotOn.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_On.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_On.py index f70972bee..90d523801 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_On.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_On.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_Out.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_Out.py index d3f9327dd..8df8b5c0f 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_Out.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_Out.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_OutAndOn.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_OutAndOn.py index cdf7845c6..700db0e8b 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_OutAndOn.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Exclude_OutAndOn.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_In.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_In.py index 212f7030c..08f9bd334 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_In.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_In.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_InAndOn.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_InAndOn.py index ac6f05660..077b5a7b3 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_InAndOn.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_InAndOn.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_NotOn.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_NotOn.py index 968b8cde3..9c92014be 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_NotOn.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_NotOn.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_On.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_On.py index 7f6301a9b..0b5dbb653 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_On.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_On.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Out.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Out.py index 3e2ee122e..7e480663a 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Out.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_Out.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_OutAndOn.py b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_OutAndOn.py index 2dcf083e3..10a0edb2c 100644 --- a/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_OutAndOn.py +++ b/src/FiltersPlugin/Test/TestFilter_RelativeToSolid_OutAndOn.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge1.py index 337a60e7c..22be53f30 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge2.py index ecf9081e7..7b3f9c358 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge3.py index fcc0d77f4..435a9b176 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Edge3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge1.py index a34b85e02..e70c0cec7 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge2.py index ed3fbc5c2..81e0868e3 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge3.py index 196fe2688..193505ac4 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Edge3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face1.py index 61c5d930e..3118e21cc 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face2.py index 24fad5e19..2b195ebc3 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face3.py index 895dcf2b0..f0c605b27 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Face3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex1.py index 9615c3159..584320d81 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex2.py index 40f702549..976a45739 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex3.py index 695d9e7ff..b95a36784 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Exclude_Vertex3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face1.py index 8dffb37ad..a6ff26029 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face2.py index 46ecb8e39..00bf37ba5 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face3.py index b5b2a779a..1e2d2026a 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Face3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge1.py index 1478216ab..de754ebec 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge2.py index b658b1147..41f2db643 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge3.py index 7d771b35a..dc66da2cb 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Edge3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge1.py index 48434b13a..a3d4e0ecb 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge2.py index 863bb1939..dd00b88e8 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge3.py index e7a3e5d4a..071a50372 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Edge3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face1.py index 03689c752..29bc2d365 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face2.py index cd89a605f..137a3e92e 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face3.py index 65315442b..17b59e6fb 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Face3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex1.py index 2c2ff0fa6..dd3d8c4f4 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex2.py index 7a56a8d98..997828938 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex3.py index a5c8fb027..bfa100e77 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face1.py index 2a945dcd5..3a61e3b74 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face2.py index d4ca6580c..cf5194807 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face3.py index 7f9da861d..c3fb9c522 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Face3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex1.py index 04529dbce..b9313e95d 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex2.py index 9b24cf7a7..4dc29d252 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex3.py index 7f0bcfe84..29203b354 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Prop_Vertex3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex1.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex1.py index ce5501a91..cfab9e7fe 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex1.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex2.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex2.py index 675437456..bff3566ef 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex2.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex3.py b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex3.py index 948b14b25..15c1a8b10 100644 --- a/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex3.py +++ b/src/FiltersPlugin/Test/TestFilter_TopoConnectedFaces_Vertex3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilters.py b/src/FiltersPlugin/Test/TestFilters.py index 82ed1498e..8f0662f4f 100644 --- a/src/FiltersPlugin/Test/TestFilters.py +++ b/src/FiltersPlugin/Test/TestFilters.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilters_Mixed1.py b/src/FiltersPlugin/Test/TestFilters_Mixed1.py index f85e8bc3f..1ab8db5ed 100644 --- a/src/FiltersPlugin/Test/TestFilters_Mixed1.py +++ b/src/FiltersPlugin/Test/TestFilters_Mixed1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilters_Mixed2.py b/src/FiltersPlugin/Test/TestFilters_Mixed2.py index 848c490cf..f1d8a1afb 100644 --- a/src/FiltersPlugin/Test/TestFilters_Mixed2.py +++ b/src/FiltersPlugin/Test/TestFilters_Mixed2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/FiltersPlugin/Test/TestFilters_Remove.py b/src/FiltersPlugin/Test/TestFilters_Remove.py index 4d58f6999..fee3a5226 100644 --- a/src/FiltersPlugin/Test/TestFilters_Remove.py +++ b/src/FiltersPlugin/Test/TestFilters_Remove.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer model.begin() partSet = model.moduleDocument() diff --git a/src/GeomAPI/Test/Test2879.py b/src/GeomAPI/Test/Test2879.py index 3076e381e..825df4a1b 100644 --- a/src/GeomAPI/Test/Test2879.py +++ b/src/GeomAPI/Test/Test2879.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt import math TOLERANCE = 1.0e-7 diff --git a/src/GeomAPI/Test/TestAx123.py b/src/GeomAPI/Test/TestAx123.py index 15ed2414c..eb0282846 100644 --- a/src/GeomAPI/Test/TestAx123.py +++ b/src/GeomAPI/Test/TestAx123.py @@ -19,7 +19,14 @@ import math -from GeomAPI import * +from GeomAPI import ( + GeomAPI_Ax1, + GeomAPI_Ax2, + GeomAPI_Ax3, + GeomAPI_Dir, + GeomAPI_Pnt, + GeomAPI_Pnt2d, +) TOLERANCE = 1.0e-7 diff --git a/src/GeomAPI/Test/TestBuilders.py b/src/GeomAPI/Test/TestBuilders.py index 66c1a2a53..5101b2cdc 100644 --- a/src/GeomAPI/Test/TestBuilders.py +++ b/src/GeomAPI/Test/TestBuilders.py @@ -17,7 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import math from GeomAlgoAPI import GeomAlgoAPI_Circ2dBuilder as circBuilder from GeomAlgoAPI import GeomAlgoAPI_CurveBuilder as curveBuilder diff --git a/src/GeomAPI/Test/TestEllipse2d.py b/src/GeomAPI/Test/TestEllipse2d.py index f55170981..691f7f46e 100644 --- a/src/GeomAPI/Test/TestEllipse2d.py +++ b/src/GeomAPI/Test/TestEllipse2d.py @@ -17,9 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import math -from GeomAPI import * +from GeomAPI import GeomAPI_Dir2d, GeomAPI_Ellipse2d, GeomAPI_Pnt2d TOLERANCE = 1.0e-7 diff --git a/src/GeomAPI/Test/TestLine.py b/src/GeomAPI/Test/TestLine.py index 57386b870..f51b1a776 100644 --- a/src/GeomAPI/Test/TestLine.py +++ b/src/GeomAPI/Test/TestLine.py @@ -17,9 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import math -from GeomAPI import * +from GeomAPI import GeomAPI_Dir2d, GeomAPI_Lin, GeomAPI_Lin2d, GeomAPI_Pnt2d TOLERANCE = 1.0e-7 diff --git a/src/GeomAPI/Test/TestPolygon.py b/src/GeomAPI/Test/TestPolygon.py index c251a08f7..52350bf94 100644 --- a/src/GeomAPI/Test/TestPolygon.py +++ b/src/GeomAPI/Test/TestPolygon.py @@ -22,7 +22,6 @@ from SketchAPI import * from salome.shaper import model -import math TOLERANCE = 1.0e-7 diff --git a/src/GeomDataAPI/Test/TestConstants.py b/src/GeomDataAPI/Test/TestConstants.py index f295e956f..41de533a7 100644 --- a/src/GeomDataAPI/Test/TestConstants.py +++ b/src/GeomDataAPI/Test/TestConstants.py @@ -20,7 +20,7 @@ # =============================================================================== # Test GeomDataAPI static methods # =============================================================================== -from GeomDataAPI import * +from GeomDataAPI import GeomDataAPI_Dir, GeomDataAPI_Point, GeomDataAPI_Point2D assert GeomDataAPI_Point.typeId() == "Point" assert GeomDataAPI_Dir.typeId() == "Dir" diff --git a/src/Locale/Test/TestUTF8.py b/src/Locale/Test/TestUTF8.py index e57821d8d..4b5d53263 100644 --- a/src/Locale/Test/TestUTF8.py +++ b/src/Locale/Test/TestUTF8.py @@ -57,7 +57,7 @@ Cut_1.result().subResult(2).setName("Cut_1_1_3") model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Cut_1, 1) model.testNbSubResults(Cut_1, [3]) diff --git a/src/ModelAPI/Test/Test1562.py b/src/ModelAPI/Test/Test1562.py index 6b77e12e9..13013de18 100644 --- a/src/ModelAPI/Test/Test1562.py +++ b/src/ModelAPI/Test/Test1562.py @@ -151,7 +151,7 @@ lenParam.setValue(100) model.do() # check the result validity -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(ExtrusionCut_2.feature()) diff --git a/src/ModelAPI/Test/Test19217.py b/src/ModelAPI/Test/Test19217.py index 5db2abce8..3f50b6a55 100644 --- a/src/ModelAPI/Test/Test19217.py +++ b/src/ModelAPI/Test/Test19217.py @@ -47,7 +47,7 @@ Shell_2 = model.addShell( ) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Shell_2.feature()) diff --git a/src/ModelAPI/Test/Test19707.py b/src/ModelAPI/Test/Test19707.py index c628fdac2..9bcda3560 100644 --- a/src/ModelAPI/Test/Test19707.py +++ b/src/ModelAPI/Test/Test19707.py @@ -90,7 +90,7 @@ Extrusion_2 = model.addExtrusion( ) model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Sketch_2.feature()) diff --git a/src/ModelAPI/Test/Test19726.py b/src/ModelAPI/Test/Test19726.py index 303a7e18b..fa9849d0d 100644 --- a/src/ModelAPI/Test/Test19726.py +++ b/src/ModelAPI/Test/Test19726.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/ModelAPI/Test/Test19932.py b/src/ModelAPI/Test/Test19932.py index 447727834..89e7cfca3 100644 --- a/src/ModelAPI/Test/Test19932.py +++ b/src/ModelAPI/Test/Test19932.py @@ -70,7 +70,7 @@ Fillet_1 = model.addFillet( model.end() # check the fillet validity -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Fillet_1.feature()) diff --git a/src/ModelAPI/Test/Test2170.py b/src/ModelAPI/Test/Test2170.py index 7b37ca531..fbaf82ffb 100644 --- a/src/ModelAPI/Test/Test2170.py +++ b/src/ModelAPI/Test/Test2170.py @@ -123,7 +123,7 @@ model.do() model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/ModelAPI/Test/Test2228.py b/src/ModelAPI/Test/Test2228.py index 4426d5481..1a8bfbcbb 100644 --- a/src/ModelAPI/Test/Test2228.py +++ b/src/ModelAPI/Test/Test2228.py @@ -148,7 +148,7 @@ model.do() model.end() # check that remove sub-shapes contains correct selection -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Remove_SubShapes_1.feature()) diff --git a/src/ModelAPI/Test/Test2241.py b/src/ModelAPI/Test/Test2241.py index 4b0e9c4bd..4ff9d9479 100644 --- a/src/ModelAPI/Test/Test2241.py +++ b/src/ModelAPI/Test/Test2241.py @@ -485,7 +485,7 @@ Part_1_doc.moveFeature(Group_3.feature(), Group_2.feature()) model.end() # check that all groups are correct -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() diff --git a/src/ModelAPI/Test/Test2413.py b/src/ModelAPI/Test/Test2413.py index f6121247e..6082ed058 100644 --- a/src/ModelAPI/Test/Test2413.py +++ b/src/ModelAPI/Test/Test2413.py @@ -83,7 +83,7 @@ Solid_1_objects = [ ] Solid_1 = model.addSolid(Part_1_doc, Solid_1_objects) # check that resulting build-solid feature is invalid: only one not-closed face is used -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Solid_1.feature()) == False diff --git a/src/ModelAPI/Test/Test2491.py b/src/ModelAPI/Test/Test2491.py index b323b0d99..c94930e52 100644 --- a/src/ModelAPI/Test/Test2491.py +++ b/src/ModelAPI/Test/Test2491.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/Test2510.py b/src/ModelAPI/Test/Test2510.py index 555f9d518..b0b8bede2 100644 --- a/src/ModelAPI/Test/Test2510.py +++ b/src/ModelAPI/Test/Test2510.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Arc, SketchAPI_Line from salome.shaper import model diff --git a/src/ModelAPI/Test/Test26745.py b/src/ModelAPI/Test/Test26745.py index 1e6733f19..884e0b6c3 100644 --- a/src/ModelAPI/Test/Test26745.py +++ b/src/ModelAPI/Test/Test26745.py @@ -570,7 +570,7 @@ Group_1.result().setName("ValidEdge") model.end() # check that resulting group selection is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Group_1.feature()) diff --git a/src/ModelAPI/Test/Test2685.py b/src/ModelAPI/Test/Test2685.py index ae84c788a..f42133311 100644 --- a/src/ModelAPI/Test/Test2685.py +++ b/src/ModelAPI/Test/Test2685.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/Test2873.py b/src/ModelAPI/Test/Test2873.py index 4dc695967..5afd585a7 100644 --- a/src/ModelAPI/Test/Test2873.py +++ b/src/ModelAPI/Test/Test2873.py @@ -23,7 +23,7 @@ """ from salome.shaper import model -from ModelAPI import * +from ModelAPI import FeatureList model.begin() partSet = model.moduleDocument() diff --git a/src/ModelAPI/Test/Test2903.py b/src/ModelAPI/Test/Test2903.py index 2b1eac6e8..343cf0e64 100644 --- a/src/ModelAPI/Test/Test2903.py +++ b/src/ModelAPI/Test/Test2903.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/ModelAPI/Test/Test3020.py b/src/ModelAPI/Test/Test3020.py index 7949d5c1d..28c5532d7 100644 --- a/src/ModelAPI/Test/Test3020.py +++ b/src/ModelAPI/Test/Test3020.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/ModelAPI/Test/Test3116.py b/src/ModelAPI/Test/Test3116.py index a30ee4605..9cdba5a20 100644 --- a/src/ModelAPI/Test/Test3116.py +++ b/src/ModelAPI/Test/Test3116.py @@ -34,7 +34,7 @@ Edge_1 = model.addEdge( model.end() # check the result validity -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Edge_1.feature()) diff --git a/src/ModelAPI/Test/TestConstants.py b/src/ModelAPI/Test/TestConstants.py index 73f27e4b5..43e6fd840 100644 --- a/src/ModelAPI/Test/TestConstants.py +++ b/src/ModelAPI/Test/TestConstants.py @@ -20,7 +20,14 @@ # =============================================================================== # Test ModelAPI static methods # =============================================================================== -from ModelAPI import * +from ModelAPI import ( + ModelAPI_AttributeDocRef, + ModelAPI_AttributeDouble, + ModelAPI_AttributeRefAttr, + ModelAPI_AttributeRefList, + ModelAPI_AttributeReference, + ModelAPI_Feature, +) assert ModelAPI_Feature.group() == "Features" assert ModelAPI_AttributeDocRef.typeId() == "DocRef" diff --git a/src/ModelAPI/Test/TestCustomName_BooleanCut.py b/src/ModelAPI/Test/TestCustomName_BooleanCut.py index d7b735c04..2fee8d70f 100644 --- a/src/ModelAPI/Test/TestCustomName_BooleanCut.py +++ b/src/ModelAPI/Test/TestCustomName_BooleanCut.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/TestCustomName_CutCompSolid.py b/src/ModelAPI/Test/TestCustomName_CutCompSolid.py index 66631801d..5dbf41406 100644 --- a/src/ModelAPI/Test/TestCustomName_CutCompSolid.py +++ b/src/ModelAPI/Test/TestCustomName_CutCompSolid.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/TestCustomName_CutGroup.py b/src/ModelAPI/Test/TestCustomName_CutGroup.py index a054d42cf..3bd79062a 100644 --- a/src/ModelAPI/Test/TestCustomName_CutGroup.py +++ b/src/ModelAPI/Test/TestCustomName_CutGroup.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/TestFeatureSelection_2.py b/src/ModelAPI/Test/TestFeatureSelection_2.py index 1d57a0c43..c891eb49f 100644 --- a/src/ModelAPI/Test/TestFeatureSelection_2.py +++ b/src/ModelAPI/Test/TestFeatureSelection_2.py @@ -21,7 +21,7 @@ # produced from the scetch, then change the number of sketch contours, so, anytway all extrusions must # still be selected in the Cut Boolean oepration -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/ModelAPI/Test/TestFolder_Sketch.py b/src/ModelAPI/Test/TestFolder_Sketch.py index 006150285..ab5743c5b 100644 --- a/src/ModelAPI/Test/TestFolder_Sketch.py +++ b/src/ModelAPI/Test/TestFolder_Sketch.py @@ -21,7 +21,7 @@ Test checks adding sketch into a folder """ -from ModelAPI import * +from ModelAPI import FeatureList, ModelAPI_Session from salome.shaper import model model.begin() diff --git a/src/ModelAPI/Test/TestGeomNamingEdgeByFilter.py b/src/ModelAPI/Test/TestGeomNamingEdgeByFilter.py index 0f66bba45..de4872df7 100644 --- a/src/ModelAPI/Test/TestGeomNamingEdgeByFilter.py +++ b/src/ModelAPI/Test/TestGeomNamingEdgeByFilter.py @@ -61,7 +61,7 @@ Placement_1.setEndShape( model.end() # check that placement is valid -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Placement_1.feature()) diff --git a/src/ModelAPI/Test/TestGeomNamingSketchPlane.py b/src/ModelAPI/Test/TestGeomNamingSketchPlane.py index fd4289fa7..83b5dee4e 100644 --- a/src/ModelAPI/Test/TestGeomNamingSketchPlane.py +++ b/src/ModelAPI/Test/TestGeomNamingSketchPlane.py @@ -205,7 +205,7 @@ lenParam.setValue(700) model.end() # check that sketch_3 and extrusion are updated well -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(ExtrusionCut_2.feature()) diff --git a/src/ModelAPI/Test/TestResults.py b/src/ModelAPI/Test/TestResults.py index 8023da8fb..df5530b5b 100644 --- a/src/ModelAPI/Test/TestResults.py +++ b/src/ModelAPI/Test/TestResults.py @@ -25,7 +25,7 @@ # ========================================================================= # Initialization of the test # ========================================================================= -from ModelAPI import * +from ModelAPI import ModelAPI_Session __updated__ = "2016-20-16" diff --git a/src/ModelAPI/Test/TestSaveOpen1.py b/src/ModelAPI/Test/TestSaveOpen1.py index 9fd824637..c9f8b0f60 100644 --- a/src/ModelAPI/Test/TestSaveOpen1.py +++ b/src/ModelAPI/Test/TestSaveOpen1.py @@ -19,7 +19,7 @@ from salome.shaper import model from tempfile import TemporaryDirectory -from ModelAPI import * +from ModelAPI import ModelAPI_Session, StringList model.begin() partSet = model.moduleDocument() diff --git a/src/ModelAPI/Test/TestSaveOpen2.py b/src/ModelAPI/Test/TestSaveOpen2.py index 5567ddea1..e8e85bacc 100644 --- a/src/ModelAPI/Test/TestSaveOpen2.py +++ b/src/ModelAPI/Test/TestSaveOpen2.py @@ -19,7 +19,13 @@ from salome.shaper import model from tempfile import TemporaryDirectory -from ModelAPI import * +from ModelAPI import ( + ModelAPI_Session, + StringList, + modelAPI_ResultField, + modelAPI_ResultPart, + objectToFeature, +) model.begin() partSet = model.moduleDocument() diff --git a/src/ModelAPI/Test/TestSelectionCircleCenter.py b/src/ModelAPI/Test/TestSelectionCircleCenter.py index fa1d7a096..697a38218 100644 --- a/src/ModelAPI/Test/TestSelectionCircleCenter.py +++ b/src/ModelAPI/Test/TestSelectionCircleCenter.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/TestSelectionInPart.py b/src/ModelAPI/Test/TestSelectionInPart.py index d2cad36bb..0d16ecdf7 100644 --- a/src/ModelAPI/Test/TestSelectionInPart.py +++ b/src/ModelAPI/Test/TestSelectionInPart.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/TestSelectionInitialization.py b/src/ModelAPI/Test/TestSelectionInitialization.py index 6df0a91ec..2283393fb 100644 --- a/src/ModelAPI/Test/TestSelectionInitialization.py +++ b/src/ModelAPI/Test/TestSelectionInitialization.py @@ -19,7 +19,7 @@ from salome.shaper import model from tempfile import TemporaryDirectory -from ModelAPI import * +from ModelAPI import ModelAPI_Session, StringList, modelAPI_ResultPart, objectToFeature model.begin() partSet = model.moduleDocument() diff --git a/src/ModelAPI/Test/TestSelectionRestore.py b/src/ModelAPI/Test/TestSelectionRestore.py index 6d5b8dfb0..85472b1c1 100644 --- a/src/ModelAPI/Test/TestSelectionRestore.py +++ b/src/ModelAPI/Test/TestSelectionRestore.py @@ -643,7 +643,7 @@ model.do() EpVoiles.setValue(0.18) model.do() -from ModelAPI import * +from ModelAPI import ModelAPI_Session, objectToResult aFactory = ModelAPI_Session.get().validators() for i in range(Part_1_doc.size("Groups")): diff --git a/src/ModelAPI/Test/TestSelectionScope.py b/src/ModelAPI/Test/TestSelectionScope.py index 8a19503ce..31ad355ae 100644 --- a/src/ModelAPI/Test/TestSelectionScope.py +++ b/src/ModelAPI/Test/TestSelectionScope.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from GeomAPI import * +from GeomAPI import GeomAPI_Ax3, GeomAPI_Dir, GeomAPI_Pnt from salome.shaper import model diff --git a/src/ModelAPI/Test/TestWeakNaming2125.py b/src/ModelAPI/Test/TestWeakNaming2125.py index 9421c1646..a22e17347 100644 --- a/src/ModelAPI/Test/TestWeakNaming2125.py +++ b/src/ModelAPI/Test/TestWeakNaming2125.py @@ -138,7 +138,7 @@ model.do() model.do() model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert aFactory.validate(Sketch_3.feature()) diff --git a/src/ModelAPI/Test/TestWeakNaming2375.py b/src/ModelAPI/Test/TestWeakNaming2375.py index 179962e4d..36fcdf47d 100644 --- a/src/ModelAPI/Test/TestWeakNaming2375.py +++ b/src/ModelAPI/Test/TestWeakNaming2375.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/ModelAPI/Test/TestWeakNamingSortOrder.py b/src/ModelAPI/Test/TestWeakNamingSortOrder.py index a46c2215e..97ee26ee0 100644 --- a/src/ModelAPI/Test/TestWeakNamingSortOrder.py +++ b/src/ModelAPI/Test/TestWeakNamingSortOrder.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/ModelHighAPI/Test/Test19990_1.py b/src/ModelHighAPI/Test/Test19990_1.py index cb60d2037..1a4ffe979 100644 --- a/src/ModelHighAPI/Test/Test19990_1.py +++ b/src/ModelHighAPI/Test/Test19990_1.py @@ -100,7 +100,7 @@ ExtrusionCut_1 = model.addExtrusionCut( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(ExtrusionCut_1, 1) model.testNbSubResults(ExtrusionCut_1, [0]) diff --git a/src/ModelHighAPI/Test/Test19990_2.py b/src/ModelHighAPI/Test/Test19990_2.py index 250acdeb1..e7b5cdc47 100644 --- a/src/ModelHighAPI/Test/Test19990_2.py +++ b/src/ModelHighAPI/Test/Test19990_2.py @@ -42,7 +42,7 @@ ImportResult_1 = model.addImportResult( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.testNbResults(Part_1, 1) model.testNbSubResults(Part_1, [0]) diff --git a/src/ModelHighAPI/Test/Test2488.py b/src/ModelHighAPI/Test/Test2488.py index 400069f92..fdbf2435c 100644 --- a/src/ModelHighAPI/Test/Test2488.py +++ b/src/ModelHighAPI/Test/Test2488.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/ModelHighAPI/Test/TestDouble.py b/src/ModelHighAPI/Test/TestDouble.py index 5f7420f47..8c80bfe94 100644 --- a/src/ModelHighAPI/Test/TestDouble.py +++ b/src/ModelHighAPI/Test/TestDouble.py @@ -24,13 +24,13 @@ import ModelHighAPI class DoubleTestCase(unittest.TestCase): def test_create_default(self): - default = ModelHighAPI.ModelHighAPI_Double() + ModelHighAPI.ModelHighAPI_Double() def test_create_from_double(self): - from_double = ModelHighAPI.ModelHighAPI_Double(100.0) + ModelHighAPI.ModelHighAPI_Double(100.0) def test_create_from_text(self): - from_string = ModelHighAPI.ModelHighAPI_Double("200 + x") + ModelHighAPI.ModelHighAPI_Double("200 + x") if __name__ == "__main__": diff --git a/src/ModelHighAPI/Test/TestInteger.py b/src/ModelHighAPI/Test/TestInteger.py index 23c8f69fc..3e7c4f437 100644 --- a/src/ModelHighAPI/Test/TestInteger.py +++ b/src/ModelHighAPI/Test/TestInteger.py @@ -24,13 +24,13 @@ import ModelHighAPI class IntegerTestCase(unittest.TestCase): def test_create_default(self): - default = ModelHighAPI.ModelHighAPI_Integer() + ModelHighAPI.ModelHighAPI_Integer() def test_create_from_integer(self): - from_integer = ModelHighAPI.ModelHighAPI_Integer(100) + ModelHighAPI.ModelHighAPI_Integer(100) def test_create_from_text(self): - from_string = ModelHighAPI.ModelHighAPI_Integer("200 + x") + ModelHighAPI.ModelHighAPI_Integer("200 + x") if __name__ == "__main__": diff --git a/src/ParametersPlugin/Test/Test2392.py b/src/ParametersPlugin/Test/Test2392.py index 2c93b1cfd..fbf027e12 100644 --- a/src/ParametersPlugin/Test/Test2392.py +++ b/src/ParametersPlugin/Test/Test2392.py @@ -42,7 +42,7 @@ model.end() # due to the scenario, change the active document model.begin() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() aSession.setActiveDocument(partSet, False) diff --git a/src/ParametersPlugin/Test/TestParameterChangeValue.py b/src/ParametersPlugin/Test/TestParameterChangeValue.py index 939b4c555..0b878f66b 100644 --- a/src/ParametersPlugin/Test/TestParameterChangeValue.py +++ b/src/ParametersPlugin/Test/TestParameterChangeValue.py @@ -40,7 +40,6 @@ # ========================================================================= from GeomDataAPI import * from ModelAPI import * -import math import unittest from salome.shaper import model diff --git a/src/ParametersPlugin/Test/TestParameterRename.py b/src/ParametersPlugin/Test/TestParameterRename.py index 7769ec837..a93382a24 100644 --- a/src/ParametersPlugin/Test/TestParameterRename.py +++ b/src/ParametersPlugin/Test/TestParameterRename.py @@ -40,7 +40,6 @@ # ========================================================================= from GeomDataAPI import * from ModelAPI import * -import math import unittest from salome.shaper import model diff --git a/src/ParametersPlugin/Test/TestParametersMgr.py b/src/ParametersPlugin/Test/TestParametersMgr.py index 5320b8b07..2b3181c33 100644 --- a/src/ParametersPlugin/Test/TestParametersMgr.py +++ b/src/ParametersPlugin/Test/TestParametersMgr.py @@ -26,7 +26,7 @@ # ========================================================================= # Initialization of the test # ========================================================================= -from ModelAPI import * +from ModelAPI import ModelAPI_Session __updated__ = "2018-12-05" diff --git a/src/PythonAPI/Test/TestFeaturesExtrusion.py b/src/PythonAPI/Test/TestFeaturesExtrusion.py index 6632e969d..db451a1cb 100644 --- a/src/PythonAPI/Test/TestFeaturesExtrusion.py +++ b/src/PythonAPI/Test/TestFeaturesExtrusion.py @@ -46,7 +46,7 @@ class FeaturesExtrusionFixture(FeaturesAddExtrusionFixture): FeaturesAddExtrusionFixture.setUp(self) # Create extrusion sketch = model.addSketch(self.part, model.defaultPlane("XOY")) - circle = sketch.addCircle(0, 0, 10) + sketch.addCircle(0, 0, 10) model.do() base = sketch.selectFace() @@ -64,7 +64,7 @@ class FeaturesExtrusionFixture(FeaturesAddExtrusionFixture): class FeaturesAddExtrusionTestCase(FeaturesAddExtrusionFixture): def test_add_extrusion_by_face_and_size(self): sketch = model.addSketch(self.part, model.defaultPlane("XOY")) - circle = sketch.addCircle(0, 0, 10) + sketch.addCircle(0, 0, 10) model.do() base = sketch.selectFace() @@ -82,17 +82,17 @@ class FeaturesAddExtrusionTestCase(FeaturesAddExtrusionFixture): def test_add_extrusion_by_face_and_planes(self): # base base_sketch = model.addSketch(self.part, model.defaultPlane("XOY")) - base_circle = base_sketch.addCircle(0, 0, 10) + base_sketch.addCircle(0, 0, 10) # to to_plane = model.defaultPlane("XOY") to_plane.origin().setZ(10) to_sketch = model.addSketch(self.part, to_plane) - to_circle = to_sketch.addCircle(0, 0, 10) + to_sketch.addCircle(0, 0, 10) # from from_plane = model.defaultPlane("XOY") from_plane.origin().setZ(-10) from_sketch = model.addSketch(self.part, from_plane) - from_circle = from_sketch.addCircle(0, 0, 10) + from_sketch.addCircle(0, 0, 10) model.do() @@ -165,12 +165,12 @@ class FeaturesExtrusionTestCase(FeaturesExtrusionFixture): to_plane = model.defaultPlane("XOY") to_plane.origin().setZ(10) to_sketch = model.addSketch(self.part, to_plane) - to_circle = to_sketch.addCircle(0, 0, 10) + to_sketch.addCircle(0, 0, 10) # from from_plane = model.defaultPlane("XOY") from_plane.origin().setZ(-10) from_sketch = model.addSketch(self.part, from_plane) - from_circle = from_sketch.addCircle(0, 0, 10) + from_sketch.addCircle(0, 0, 10) model.do() diff --git a/src/PythonAPI/Test/TestFeaturesRevolution.py b/src/PythonAPI/Test/TestFeaturesRevolution.py index c4d9ae450..d29f50182 100644 --- a/src/PythonAPI/Test/TestFeaturesRevolution.py +++ b/src/PythonAPI/Test/TestFeaturesRevolution.py @@ -47,7 +47,7 @@ class FeaturesRevolutionFixture(FeaturesAddRevolutionFixture): # Create revolution # base base_sketch = model.addSketch(self.part, model.defaultPlane("XOY")) - circle = base_sketch.addCircle(0, 0, 10) + base_sketch.addCircle(0, 0, 10) model.do() @@ -72,7 +72,7 @@ class FeaturesAddRevolutionTestCase(FeaturesAddRevolutionFixture): def test_add_revolution_by_face_and_angles(self): # base base_sketch = model.addSketch(self.part, model.defaultPlane("XOY")) - circle = base_sketch.addCircle(0, 0, 10) + base_sketch.addCircle(0, 0, 10) model.do() @@ -92,17 +92,17 @@ class FeaturesAddRevolutionTestCase(FeaturesAddRevolutionFixture): def test_add_revolution_by_face_and_planes(self): # base base_sketch = model.addSketch(self.part, model.defaultPlane("XOY")) - base_circle = base_sketch.addCircle(0, 0, 10) + base_sketch.addCircle(0, 0, 10) # to to_plane = model.defaultPlane("XOY") to_plane.origin().setZ(10) to_sketch = model.addSketch(self.part, to_plane) - to_circle = to_sketch.addCircle(0, 0, 10) + to_sketch.addCircle(0, 0, 10) # from from_plane = model.defaultPlane("XOY") from_plane.origin().setZ(-10) from_sketch = model.addSketch(self.part, from_plane) - from_circle = from_sketch.addCircle(0, 0, 10) + from_sketch.addCircle(0, 0, 10) model.do() @@ -176,17 +176,17 @@ class FeaturesRevolutionTestCase(FeaturesRevolutionFixture): def test_revolution_set_planes_and_offsets(self): # base base_sketch = model.addSketch(self.part, model.defaultPlane("XOY")) - base_circle = base_sketch.addCircle(0, 0, 10) + base_sketch.addCircle(0, 0, 10) # to to_plane = model.defaultPlane("XOY") to_plane.origin().setZ(10) to_sketch = model.addSketch(self.part, to_plane) - to_circle = to_sketch.addCircle(0, 0, 10) + to_sketch.addCircle(0, 0, 10) # from from_plane = model.defaultPlane("XOY") from_plane.origin().setZ(-10) from_sketch = model.addSketch(self.part, from_plane) - from_circle = from_sketch.addCircle(0, 0, 10) + from_sketch.addCircle(0, 0, 10) model.do() diff --git a/src/PythonAPI/Test/TestShapeInfo.py b/src/PythonAPI/Test/TestShapeInfo.py index 03d2e6b92..f55c7a660 100644 --- a/src/PythonAPI/Test/TestShapeInfo.py +++ b/src/PythonAPI/Test/TestShapeInfo.py @@ -19,7 +19,7 @@ from salome.shaper import model from salome.shaper import geom -from GeomAPI import * +from GeomAPI import GeomAPI_Shape model.begin() partSet = model.moduleDocument() diff --git a/src/PythonAPI/Test/TestSketcherAddMirror.py b/src/PythonAPI/Test/TestSketcherAddMirror.py index 9b5236b33..091909db4 100644 --- a/src/PythonAPI/Test/TestSketcherAddMirror.py +++ b/src/PythonAPI/Test/TestSketcherAddMirror.py @@ -20,11 +20,9 @@ import unittest from salome.shaper import model from TestSketcher import SketcherTestCase -from ModelAPI import * +from ModelAPI import ModelAPI_Feature from GeomDataAPI import geomDataAPI_Point2D -import logging - class SketcherAddLine(SketcherTestCase): def setUp(self): diff --git a/src/PythonAPI/examples/Platine.py b/src/PythonAPI/examples/Platine.py index 0fc0b974d..d78030eb0 100644 --- a/src/PythonAPI/examples/Platine.py +++ b/src/PythonAPI/examples/Platine.py @@ -26,7 +26,6 @@ from salome.shaper import model # START DEBUG PURPOSES # Should be removed -import os import ModelAPI # END DEBUG PURPOSES diff --git a/src/PythonAPI/model/dump/DumpAssistant.py b/src/PythonAPI/model/dump/DumpAssistant.py index 00a3d12af..6d529ae80 100644 --- a/src/PythonAPI/model/dump/DumpAssistant.py +++ b/src/PythonAPI/model/dump/DumpAssistant.py @@ -128,13 +128,12 @@ class DumpAssistant(ModelHighAPI.ModelHighAPI_Dumper): if self.myEngine == None: import SHAPERSTUDY_utils - aComponent = SHAPERSTUDY_utils.findOrCreateComponent() + SHAPERSTUDY_utils.findOrCreateComponent() self.myEngine = SHAPERSTUDY_utils.getEngine() if self.myEngine != 1: self.myEngine.StoreVariableName(theEntry, theVarName) except: self.myEngine = 1 # invalid access - pass # Instance of dumper diff --git a/src/PythonAddons/Test/TestRectangleCentered.py b/src/PythonAddons/Test/TestRectangleCentered.py index 6982d0dde..f83a5b8e8 100755 --- a/src/PythonAddons/Test/TestRectangleCentered.py +++ b/src/PythonAddons/Test/TestRectangleCentered.py @@ -20,7 +20,7 @@ from salome.shaper import model from salome.shaper import geom -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point def checkRectangle(lines, center, corner, tolerance=1.0e-7): diff --git a/src/PythonAddons/Test/TestcompoundVertices.py b/src/PythonAddons/Test/TestcompoundVertices.py index 6d9611414..0bd44a9ea 100755 --- a/src/PythonAddons/Test/TestcompoundVertices.py +++ b/src/PythonAddons/Test/TestcompoundVertices.py @@ -19,7 +19,7 @@ from salome.shaper import model from salome.shaper import geom -from ModelAPI import * +from ModelAPI import ModelAPI_Session import os diff --git a/src/PythonAddons/Test/TestimportParameters.py b/src/PythonAddons/Test/TestimportParameters.py index f72db7f65..01d6467c9 100755 --- a/src/PythonAddons/Test/TestimportParameters.py +++ b/src/PythonAddons/Test/TestimportParameters.py @@ -19,7 +19,7 @@ from salome.shaper import model from salome.shaper import geom -from ModelAPI import * +from ModelAPI import ModelAPI_Session import os diff --git a/src/PythonAddons/Test/TestmidSurface_1.py b/src/PythonAddons/Test/TestmidSurface_1.py index 1fec65118..8b1149d7e 100755 --- a/src/PythonAddons/Test/TestmidSurface_1.py +++ b/src/PythonAddons/Test/TestmidSurface_1.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session import os diff --git a/src/PythonAddons/Test/TestmidSurface_2.py b/src/PythonAddons/Test/TestmidSurface_2.py index e032b550d..cb9d13378 100755 --- a/src/PythonAddons/Test/TestmidSurface_2.py +++ b/src/PythonAddons/Test/TestmidSurface_2.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session import os diff --git a/src/PythonAddons/Test/TestpipeNetwork_2par2.py b/src/PythonAddons/Test/TestpipeNetwork_2par2.py index 4a8aa199a..7cc5d8b29 100755 --- a/src/PythonAddons/Test/TestpipeNetwork_2par2.py +++ b/src/PythonAddons/Test/TestpipeNetwork_2par2.py @@ -22,7 +22,7 @@ __revision__ = "V02.01" import os -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() diff --git a/src/PythonAddons/Test/TestpipeNetwork_parligne.py b/src/PythonAddons/Test/TestpipeNetwork_parligne.py index 0a77d31a0..ff56c02a7 100755 --- a/src/PythonAddons/Test/TestpipeNetwork_parligne.py +++ b/src/PythonAddons/Test/TestpipeNetwork_parligne.py @@ -22,7 +22,7 @@ __revision__ = "V01.04" import os -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() diff --git a/src/PythonAddons/addons_Features.py b/src/PythonAddons/addons_Features.py index 619d924d2..838ff78f5 100755 --- a/src/PythonAddons/addons_Features.py +++ b/src/PythonAddons/addons_Features.py @@ -38,7 +38,6 @@ class PythonFeaturesPlugin(ModelAPI.ModelAPI_Plugin): ModelAPI.ModelAPI_Plugin.__init__(self) aSession = ModelAPI.ModelAPI_Session.get() aSession.registerPlugin(self) - pass def createFeature(self, theFeatureID): """Override ModelAPI_Plugin.createFeature()""" diff --git a/src/PythonAddons/doc/examples/pipeNetwork.py b/src/PythonAddons/doc/examples/pipeNetwork.py index 5f9b4d2bf..9913c50e4 100755 --- a/src/PythonAddons/doc/examples/pipeNetwork.py +++ b/src/PythonAddons/doc/examples/pipeNetwork.py @@ -17,7 +17,7 @@ import salome salome.standalone() salome.salome_init() -from ModelAPI import * +from ModelAPI import ModelAPI_Session aSession = ModelAPI_Session.get() diff --git a/src/PythonAddons/macros/midSurface/midSurface_1.py b/src/PythonAddons/macros/midSurface/midSurface_1.py index 3c2028d02..1dbb7ceb3 100755 --- a/src/PythonAddons/macros/midSurface/midSurface_1.py +++ b/src/PythonAddons/macros/midSurface/midSurface_1.py @@ -12,7 +12,7 @@ import salome salome.salome_init() -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/PythonAddons/macros/midSurface/midSurface_2.py b/src/PythonAddons/macros/midSurface/midSurface_2.py index e9ad73693..ea233cd97 100755 --- a/src/PythonAddons/macros/midSurface/midSurface_2.py +++ b/src/PythonAddons/macros/midSurface/midSurface_2.py @@ -12,7 +12,7 @@ import salome salome.salome_init() -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/PythonAddons/macros/pipeNetwork/feature.py b/src/PythonAddons/macros/pipeNetwork/feature.py index 86f4a600e..78c314336 100755 --- a/src/PythonAddons/macros/pipeNetwork/feature.py +++ b/src/PythonAddons/macros/pipeNetwork/feature.py @@ -27,7 +27,7 @@ __revision__ = "V02.17" from salome.shaper import model import ModelAPI -from GeomAPI import * +from GeomAPI import GeomAPI_Shape, GeomAPI_ShapeExplorer import numpy as np diff --git a/src/SketchAPI/Test/TestFreePoints.py b/src/SketchAPI/Test/TestFreePoints.py index 845bcf91e..c05eca99d 100644 --- a/src/SketchAPI/Test/TestFreePoints.py +++ b/src/SketchAPI/Test/TestFreePoints.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchAPI/Test/TestSketch.py b/src/SketchAPI/Test/TestSketch.py index fb2df20b1..29c8ba589 100644 --- a/src/SketchAPI/Test/TestSketch.py +++ b/src/SketchAPI/Test/TestSketch.py @@ -64,7 +64,7 @@ class SketchTestCase(unittest.TestCase): point = geom.Pnt2d(10.0, 10.0) aPoint = self.sketch.addPoint(point) aCircle = self.sketch.addCircle(point, 10.0) - aCoincidence = self.sketch.setCoincident(aPoint.coordinates(), aCircle.center()) + self.sketch.setCoincident(aPoint.coordinates(), aCircle.center()) model.do() self.checkPoint(aPoint.coordinates(), point) self.checkPoint(aCircle.center(), point) diff --git a/src/SketchPlugin/Test/Test1673.py b/src/SketchPlugin/Test/Test1673.py index e0c4a8114..7b00036b3 100644 --- a/src/SketchPlugin/Test/Test1673.py +++ b/src/SketchPlugin/Test/Test1673.py @@ -362,7 +362,7 @@ averageTime = 0 nbMoves = 0 # Two vertical constraints: due to #1889 the sketch is invalid now, not overconstrained -from ModelAPI import * +from ModelAPI import ModelAPI_Session aFactory = ModelAPI_Session.get().validators() assert not aFactory.validate(SketchConstraintVertical_10.feature()) diff --git a/src/SketchPlugin/Test/Test19101.py b/src/SketchPlugin/Test/Test19101.py index 0e9ae3cee..fc92968de 100644 --- a/src/SketchPlugin/Test/Test19101.py +++ b/src/SketchPlugin/Test/Test19101.py @@ -46,7 +46,7 @@ model.do() model.end() -from ModelAPI import * +from ModelAPI import ModelAPI_Session validators = ModelAPI_Session.get().validators() assert validators.validate(SketchProjection_1.feature()) diff --git a/src/SketchPlugin/Test/Test2018.py b/src/SketchPlugin/Test/Test2018.py index f855c1bc2..6b69eb164 100644 --- a/src/SketchPlugin/Test/Test2018.py +++ b/src/SketchPlugin/Test/Test2018.py @@ -22,7 +22,7 @@ Test case for issue #2018 "After split auxiliary circle edit of axiliary state of arc is wrong" """ -from ModelAPI import * +from ModelAPI import FeatureSet, removeFeaturesAndReferences from ModelAPI import ModelAPI_Feature from ModelAPI import FeatureList from ModelGeomAlgo import ModelGeomAlgo_Point2D diff --git a/src/SketchPlugin/Test/Test2034_1.py b/src/SketchPlugin/Test/Test2034_1.py index 520cf066c..7b079c2e5 100644 --- a/src/SketchPlugin/Test/Test2034_1.py +++ b/src/SketchPlugin/Test/Test2034_1.py @@ -22,7 +22,7 @@ Test case for issue #2034 "Conflicting constraint not raised (but found by planegcs and shaper's dof computation)" """ -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2034_3.py b/src/SketchPlugin/Test/Test2034_3.py index 972ba3975..c9fa2b04b 100644 --- a/src/SketchPlugin/Test/Test2034_3.py +++ b/src/SketchPlugin/Test/Test2034_3.py @@ -22,7 +22,7 @@ Test case for issue #2034 "Conflicting constraint not raised (but found by planegcs and shaper's dof computation)" """ -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2095.py b/src/SketchPlugin/Test/Test2095.py index a79990e76..b3beed39e 100644 --- a/src/SketchPlugin/Test/Test2095.py +++ b/src/SketchPlugin/Test/Test2095.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model lineStart = [26, 53] diff --git a/src/SketchPlugin/Test/Test2115.py b/src/SketchPlugin/Test/Test2115.py index ad4769d6b..7ac6fc353 100644 --- a/src/SketchPlugin/Test/Test2115.py +++ b/src/SketchPlugin/Test/Test2115.py @@ -23,7 +23,7 @@ """ from salome.shaper import model -from ModelAPI import * +from ModelAPI import ModelAPI_Session model.begin() partSet = model.moduleDocument() diff --git a/src/SketchPlugin/Test/Test2157_2.py b/src/SketchPlugin/Test/Test2157_2.py index cc7ddd211..0f0b694b7 100644 --- a/src/SketchPlugin/Test/Test2157_2.py +++ b/src/SketchPlugin/Test/Test2157_2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2229.py b/src/SketchPlugin/Test/Test2229.py index 428097a85..1db3c1875 100644 --- a/src/SketchPlugin/Test/Test2229.py +++ b/src/SketchPlugin/Test/Test2229.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from ModelAPI import * +from ModelAPI import ModelAPI_Session from salome.shaper import model model.begin() diff --git a/src/SketchPlugin/Test/Test2273.py b/src/SketchPlugin/Test/Test2273.py index f044049cb..6c2f16439 100644 --- a/src/SketchPlugin/Test/Test2273.py +++ b/src/SketchPlugin/Test/Test2273.py @@ -24,7 +24,7 @@ """ from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point model.begin() partSet = model.moduleDocument() diff --git a/src/SketchPlugin/Test/Test2341.py b/src/SketchPlugin/Test/Test2341.py index b6318a29d..77883c348 100644 --- a/src/SketchPlugin/Test/Test2341.py +++ b/src/SketchPlugin/Test/Test2341.py @@ -22,7 +22,7 @@ Test case for issue #2341 "SIGSEGV when trying to move a point of a projected axis" """ -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2390.py b/src/SketchPlugin/Test/Test2390.py index 997fe10b3..7e77ae575 100644 --- a/src/SketchPlugin/Test/Test2390.py +++ b/src/SketchPlugin/Test/Test2390.py @@ -23,7 +23,7 @@ """ -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2393.py b/src/SketchPlugin/Test/Test2393.py index 6f30e80e8..38ad9394e 100644 --- a/src/SketchPlugin/Test/Test2393.py +++ b/src/SketchPlugin/Test/Test2393.py @@ -23,7 +23,7 @@ """ -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2427.py b/src/SketchPlugin/Test/Test2427.py index 05196a7b1..2b365b215 100644 --- a/src/SketchPlugin/Test/Test2427.py +++ b/src/SketchPlugin/Test/Test2427.py @@ -22,7 +22,7 @@ Test case for issue #2427 "error in sketch solver" """ -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2440.py b/src/SketchPlugin/Test/Test2440.py index b4630fc5d..f6bef6b4d 100644 --- a/src/SketchPlugin/Test/Test2440.py +++ b/src/SketchPlugin/Test/Test2440.py @@ -23,7 +23,7 @@ """ -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2481.py b/src/SketchPlugin/Test/Test2481.py index 9e360307e..d288eff30 100644 --- a/src/SketchPlugin/Test/Test2481.py +++ b/src/SketchPlugin/Test/Test2481.py @@ -22,7 +22,7 @@ Test case for issue #2481 "Application error when create fillet" """ -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2654.py b/src/SketchPlugin/Test/Test2654.py index 36aa3e22e..4867800ba 100644 --- a/src/SketchPlugin/Test/Test2654.py +++ b/src/SketchPlugin/Test/Test2654.py @@ -22,7 +22,7 @@ Test case for issue #2654 "crash with a split" """ -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test2741.py b/src/SketchPlugin/Test/Test2741.py index d2afc5aab..d03330cbf 100644 --- a/src/SketchPlugin/Test/Test2741.py +++ b/src/SketchPlugin/Test/Test2741.py @@ -23,7 +23,7 @@ """ from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Constraint model.begin() partSet = model.moduleDocument() diff --git a/src/SketchPlugin/Test/Test2860.py b/src/SketchPlugin/Test/Test2860.py index dafe318ad..52813b924 100644 --- a/src/SketchPlugin/Test/Test2860.py +++ b/src/SketchPlugin/Test/Test2860.py @@ -24,7 +24,7 @@ """ from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line model.begin() partSet = model.moduleDocument() diff --git a/src/SketchPlugin/Test/Test2894.py b/src/SketchPlugin/Test/Test2894.py index 9c27bdda2..338db4a9f 100644 --- a/src/SketchPlugin/Test/Test2894.py +++ b/src/SketchPlugin/Test/Test2894.py @@ -22,7 +22,7 @@ Test case for issue #2894 "SIGSEGV in trim after double-click" """ -from SketchAPI import * +from SketchAPI import GeomAPI, SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/Test3132.py b/src/SketchPlugin/Test/Test3132.py index 97f235f65..b1b71513a 100644 --- a/src/SketchPlugin/Test/Test3132.py +++ b/src/SketchPlugin/Test/Test3132.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt2d import math ELL_CENTER_X = 10 diff --git a/src/SketchPlugin/Test/Test3154.py b/src/SketchPlugin/Test/Test3154.py index 6034f3d6f..9384bcb47 100755 --- a/src/SketchPlugin/Test/Test3154.py +++ b/src/SketchPlugin/Test/Test3154.py @@ -20,7 +20,7 @@ from salome.shaper import model from salome.shaper import geom -from SketchAPI import * +from SketchAPI import SketchAPI_Circle model.begin() partSet = model.moduleDocument() diff --git a/src/SketchPlugin/Test/TestArcBehavior.py b/src/SketchPlugin/Test/TestArcBehavior.py index 9f998cd22..0bf46d9f3 100644 --- a/src/SketchPlugin/Test/TestArcBehavior.py +++ b/src/SketchPlugin/Test/TestArcBehavior.py @@ -31,7 +31,6 @@ from GeomAPI import * from GeomDataAPI import * from ModelAPI import * -import math from salome.shaper import model aSession = ModelAPI_Session.get() diff --git a/src/SketchPlugin/Test/TestBSplineAddPole.py b/src/SketchPlugin/Test/TestBSplineAddPole.py index a923371ef..be19980ea 100644 --- a/src/SketchPlugin/Test/TestBSplineAddPole.py +++ b/src/SketchPlugin/Test/TestBSplineAddPole.py @@ -22,7 +22,7 @@ """ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt2d import random TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestChangeSketchPlane1.py b/src/SketchPlugin/Test/TestChangeSketchPlane1.py index df811fef9..654f581d6 100644 --- a/src/SketchPlugin/Test/TestChangeSketchPlane1.py +++ b/src/SketchPlugin/Test/TestChangeSketchPlane1.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model import math diff --git a/src/SketchPlugin/Test/TestChangeSketchPlane2.py b/src/SketchPlugin/Test/TestChangeSketchPlane2.py index 339558606..9cbb79cc3 100644 --- a/src/SketchPlugin/Test/TestChangeSketchPlane2.py +++ b/src/SketchPlugin/Test/TestChangeSketchPlane2.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model import math diff --git a/src/SketchPlugin/Test/TestChangeSketchPlane3.py b/src/SketchPlugin/Test/TestChangeSketchPlane3.py index 7779f1662..ee426d186 100644 --- a/src/SketchPlugin/Test/TestChangeSketchPlane3.py +++ b/src/SketchPlugin/Test/TestChangeSketchPlane3.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model import math diff --git a/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_1.py b/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_1.py index 5ec47f33f..c391b3bff 100644 --- a/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_1.py +++ b/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_1.py @@ -19,7 +19,6 @@ from GeomDataAPI import * from ModelAPI import * -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_2.py b/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_2.py index ad6d73d7b..4dd05637d 100644 --- a/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_2.py +++ b/src/SketchPlugin/Test/TestConstraintAngleBehaviorBackward_2.py @@ -19,7 +19,6 @@ from GeomDataAPI import * from ModelAPI import * -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestConstraintAngleBehaviorDirect.py b/src/SketchPlugin/Test/TestConstraintAngleBehaviorDirect.py index c8986345b..4943e09fc 100644 --- a/src/SketchPlugin/Test/TestConstraintAngleBehaviorDirect.py +++ b/src/SketchPlugin/Test/TestConstraintAngleBehaviorDirect.py @@ -19,7 +19,6 @@ from GeomDataAPI import * from ModelAPI import * -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_1.py b/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_1.py index 6dbe697dc..279d18eea 100644 --- a/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_1.py +++ b/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_1.py @@ -19,7 +19,6 @@ from GeomDataAPI import * from ModelAPI import * -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_2.py b/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_2.py index 3526be95b..75c91b18d 100644 --- a/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_2.py +++ b/src/SketchPlugin/Test/TestConstraintAngleBehaviorSupplementary_2.py @@ -19,7 +19,6 @@ from GeomDataAPI import * from ModelAPI import * -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestConstraintAngle_v0_1.py b/src/SketchPlugin/Test/TestConstraintAngle_v0_1.py index 392f1d73b..b5dbe6f4b 100644 --- a/src/SketchPlugin/Test/TestConstraintAngle_v0_1.py +++ b/src/SketchPlugin/Test/TestConstraintAngle_v0_1.py @@ -669,7 +669,7 @@ Extrusion_1 = model.addExtrusion( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape REF_VOLUME = 25018.7130187615 diff --git a/src/SketchPlugin/Test/TestConstraintAngle_v0_2.py b/src/SketchPlugin/Test/TestConstraintAngle_v0_2.py index 299d7f2c2..8b49547bc 100644 --- a/src/SketchPlugin/Test/TestConstraintAngle_v0_2.py +++ b/src/SketchPlugin/Test/TestConstraintAngle_v0_2.py @@ -671,7 +671,7 @@ Extrusion_1 = model.addExtrusion( model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape REF_VOLUME = 25018.7130187615 diff --git a/src/SketchPlugin/Test/TestConstraintAngle_v20191210_1.py b/src/SketchPlugin/Test/TestConstraintAngle_v20191210_1.py index 9d949b598..b87816666 100644 --- a/src/SketchPlugin/Test/TestConstraintAngle_v20191210_1.py +++ b/src/SketchPlugin/Test/TestConstraintAngle_v20191210_1.py @@ -669,7 +669,7 @@ model.do() model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape REF_VOLUME = 25018.7130187615 diff --git a/src/SketchPlugin/Test/TestConstraintAngle_v20191210_2.py b/src/SketchPlugin/Test/TestConstraintAngle_v20191210_2.py index 50f545e18..1271663bd 100644 --- a/src/SketchPlugin/Test/TestConstraintAngle_v20191210_2.py +++ b/src/SketchPlugin/Test/TestConstraintAngle_v20191210_2.py @@ -670,7 +670,7 @@ model.do() model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_Shape REF_VOLUME = 25018.7130187615 diff --git a/src/SketchPlugin/Test/TestConstraintCollinearEllipse.py b/src/SketchPlugin/Test/TestConstraintCollinearEllipse.py index 1f0f2cffb..b2b7697f0 100644 --- a/src/SketchPlugin/Test/TestConstraintCollinearEllipse.py +++ b/src/SketchPlugin/Test/TestConstraintCollinearEllipse.py @@ -22,7 +22,6 @@ """ import unittest -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestConstraintDistanceBehavior.py b/src/SketchPlugin/Test/TestConstraintDistanceBehavior.py index 1dbf06862..49b384961 100644 --- a/src/SketchPlugin/Test/TestConstraintDistanceBehavior.py +++ b/src/SketchPlugin/Test/TestConstraintDistanceBehavior.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestConstraintDistanceHorizontalZero.py b/src/SketchPlugin/Test/TestConstraintDistanceHorizontalZero.py index fba4054ca..8ebc446f4 100644 --- a/src/SketchPlugin/Test/TestConstraintDistanceHorizontalZero.py +++ b/src/SketchPlugin/Test/TestConstraintDistanceHorizontalZero.py @@ -25,7 +25,7 @@ import unittest import math from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Constraint __updated__ = "2019-10-22" TOLERANCE = 1.0e-6 diff --git a/src/SketchPlugin/Test/TestConstraintDistanceVerticalZero.py b/src/SketchPlugin/Test/TestConstraintDistanceVerticalZero.py index f4320ce0b..4df86f334 100644 --- a/src/SketchPlugin/Test/TestConstraintDistanceVerticalZero.py +++ b/src/SketchPlugin/Test/TestConstraintDistanceVerticalZero.py @@ -25,7 +25,7 @@ import unittest import math from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Constraint __updated__ = "2019-10-22" TOLERANCE = 1.0e-6 diff --git a/src/SketchPlugin/Test/TestConstraintDistanceZero.py b/src/SketchPlugin/Test/TestConstraintDistanceZero.py index 0fdfa9bec..ed1f2cab4 100644 --- a/src/SketchPlugin/Test/TestConstraintDistanceZero.py +++ b/src/SketchPlugin/Test/TestConstraintDistanceZero.py @@ -25,7 +25,7 @@ import unittest import math from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Constraint, SketchAPI_SketchEntity __updated__ = "2019-10-22" TOLERANCE = 1.0e-6 diff --git a/src/SketchPlugin/Test/TestConstraintHorizontalValidator.py b/src/SketchPlugin/Test/TestConstraintHorizontalValidator.py index 0273857e0..c9a83ad57 100644 --- a/src/SketchPlugin/Test/TestConstraintHorizontalValidator.py +++ b/src/SketchPlugin/Test/TestConstraintHorizontalValidator.py @@ -27,8 +27,7 @@ # of the test # ========================================================================= from salome.shaper import model -from ModelAPI import * -import math +from ModelAPI import ModelAPI_Session # ========================================================================= # Creation of a part diff --git a/src/SketchPlugin/Test/TestConstraintPerpendicularEllipseLine.py b/src/SketchPlugin/Test/TestConstraintPerpendicularEllipseLine.py index 0b5606191..197055bb4 100644 --- a/src/SketchPlugin/Test/TestConstraintPerpendicularEllipseLine.py +++ b/src/SketchPlugin/Test/TestConstraintPerpendicularEllipseLine.py @@ -19,7 +19,7 @@ from salome.shaper import model import math -from GeomAPI import * +from GeomAPI import GeomAPI_Pnt TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestConstraintTangentBSpline.py b/src/SketchPlugin/Test/TestConstraintTangentBSpline.py index 2d61a3ffe..c0b64e892 100644 --- a/src/SketchPlugin/Test/TestConstraintTangentBSpline.py +++ b/src/SketchPlugin/Test/TestConstraintTangentBSpline.py @@ -22,7 +22,6 @@ """ import unittest -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestConstraintTangentEllipse.py b/src/SketchPlugin/Test/TestConstraintTangentEllipse.py index 221d0a950..b16d75f28 100644 --- a/src/SketchPlugin/Test/TestConstraintTangentEllipse.py +++ b/src/SketchPlugin/Test/TestConstraintTangentEllipse.py @@ -22,7 +22,6 @@ """ import unittest -import math from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestCreateArcChangeType.py b/src/SketchPlugin/Test/TestCreateArcChangeType.py index f6446be7c..281d7eb2a 100644 --- a/src/SketchPlugin/Test/TestCreateArcChangeType.py +++ b/src/SketchPlugin/Test/TestCreateArcChangeType.py @@ -31,7 +31,6 @@ from GeomAPI import * from ModelAPI import * from SketchAPI import SketchAPI_Sketch from salome.shaper import model -import math __updated__ = "2017-04-06" diff --git a/src/SketchPlugin/Test/TestCreateCircleChangeType.py b/src/SketchPlugin/Test/TestCreateCircleChangeType.py index 106752621..a56be7563 100644 --- a/src/SketchPlugin/Test/TestCreateCircleChangeType.py +++ b/src/SketchPlugin/Test/TestCreateCircleChangeType.py @@ -31,7 +31,6 @@ from GeomAPI import * from ModelAPI import * from SketchAPI import SketchAPI_Sketch from salome.shaper import model -import math __updated__ = "2017-03-22" diff --git a/src/SketchPlugin/Test/TestCreateEllipticArc.py b/src/SketchPlugin/Test/TestCreateEllipticArc.py index 92aca16b1..249570331 100644 --- a/src/SketchPlugin/Test/TestCreateEllipticArc.py +++ b/src/SketchPlugin/Test/TestCreateEllipticArc.py @@ -376,7 +376,7 @@ class TestEllipticArc(unittest.TestCase): anEllipseFeature = model.lastSubFeature(self.mySketch, "SketchEllipticArc") self.myEllipse1 = SketchAPI_EllipticArc(anEllipseFeature) - anEllipse = anEllipseFeature.lastResult().shape().edge().ellipse() + anEllipseFeature.lastResult().shape().edge().ellipse() self.checkPointOnLine(self.myEllipse1.startPoint(), aLine) # check number of features model.testNbSubFeatures(self.mySketch, "SketchPoint", 7) @@ -425,7 +425,7 @@ class TestEllipticArc(unittest.TestCase): anEllipseFeature = model.lastSubFeature(self.mySketch, "SketchEllipticArc") self.myEllipse1 = SketchAPI_EllipticArc(anEllipseFeature) - anEllipse = anEllipseFeature.lastResult().shape().edge().ellipse() + anEllipseFeature.lastResult().shape().edge().ellipse() self.checkPointOnLine(self.myEllipse1.endPoint(), aLine) # check number of features model.testNbSubFeatures(self.mySketch, "SketchPoint", 7) diff --git a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned01.py b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned01.py index d6fd911cc..c1c4f1c8c 100644 --- a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned01.py +++ b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned01.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line import math TOLERANCE = 1.0e-5 diff --git a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned02.py b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned02.py index 908e8262a..bdd204643 100644 --- a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned02.py +++ b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned02.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line import math TOLERANCE = 1.0e-5 diff --git a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned03.py b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned03.py index d8491d546..380f0f4e1 100644 --- a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned03.py +++ b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned03.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line import math TOLERANCE = 1.0e-5 diff --git a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned04.py b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned04.py index 383d90de6..2a276b5d9 100644 --- a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned04.py +++ b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned04.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line import math TOLERANCE = 1.0e-5 diff --git a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned05.py b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned05.py index 43a9afaf7..4199b07a3 100644 --- a/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned05.py +++ b/src/SketchPlugin/Test/TestDistanceSignedVsUnsigned05.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Line import math TOLERANCE = 1.0e-5 diff --git a/src/SketchPlugin/Test/TestIntersectionChangeEdge.py b/src/SketchPlugin/Test/TestIntersectionChangeEdge.py index 59257d9c7..b748b5f78 100644 --- a/src/SketchPlugin/Test/TestIntersectionChangeEdge.py +++ b/src/SketchPlugin/Test/TestIntersectionChangeEdge.py @@ -22,7 +22,7 @@ Unit test of SketchPlugin_IntersectionPoint class """ -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestMoveEllipticArc.py b/src/SketchPlugin/Test/TestMoveEllipticArc.py index 212410ffb..a50357eda 100644 --- a/src/SketchPlugin/Test/TestMoveEllipticArc.py +++ b/src/SketchPlugin/Test/TestMoveEllipticArc.py @@ -24,7 +24,7 @@ import unittest import math from GeomAPI import GeomAPI_Pnt2d -from SketchAPI import * +from SketchAPI import SketchAPI_EllipticArc from salome.shaper import model __updated__ = "2019-10-15" diff --git a/src/SketchPlugin/Test/TestMoveLine.py b/src/SketchPlugin/Test/TestMoveLine.py index 17d081580..30b0ad523 100644 --- a/src/SketchPlugin/Test/TestMoveLine.py +++ b/src/SketchPlugin/Test/TestMoveLine.py @@ -91,7 +91,7 @@ class TestMoveLine(unittest.TestCase): def test_move_line_start_fixed(self): """Test 4. Movement of a line, which start point is fixed""" - fixed = self.mySketch.setFixed(self.myLine.startPoint()) + self.mySketch.setFixed(self.myLine.startPoint()) self.myDOF -= 2 model.do() self.checkDOF() @@ -105,7 +105,7 @@ class TestMoveLine(unittest.TestCase): def test_move_line_end_fixed(self): """Test 5. Movement of a line, which end point is fixed""" - fixed = self.mySketch.setFixed(self.myLine.endPoint()) + self.mySketch.setFixed(self.myLine.endPoint()) self.myDOF -= 2 model.do() self.checkDOF() @@ -119,7 +119,7 @@ class TestMoveLine(unittest.TestCase): def test_move_line_fully_fixed(self): """Test 6. Movement of fully fixed line (should not change its coordinates)""" - fixed = self.mySketch.setFixed(self.myLine.defaultResult()) + self.mySketch.setFixed(self.myLine.defaultResult()) self.myDOF -= 4 model.do() diff --git a/src/SketchPlugin/Test/TestMovePoint.py b/src/SketchPlugin/Test/TestMovePoint.py index 2b03e9bf5..75f39fc9f 100644 --- a/src/SketchPlugin/Test/TestMovePoint.py +++ b/src/SketchPlugin/Test/TestMovePoint.py @@ -92,7 +92,7 @@ class TestMovePoint(unittest.TestCase): """Test 4. Movement of fully fixed point (should not be changed)""" coord = [self.myPointCoordinates.x(), self.myPointCoordinates.y()] - fixed = self.mySketch.setFixed(self.myPoint.result()) + self.mySketch.setFixed(self.myPoint.result()) self.myDOF -= 2 model.do() self.checkDOF() diff --git a/src/SketchPlugin/Test/TestMultiRotation01.py b/src/SketchPlugin/Test/TestMultiRotation01.py index d08d1f1cf..ca5570bd1 100644 --- a/src/SketchPlugin/Test/TestMultiRotation01.py +++ b/src/SketchPlugin/Test/TestMultiRotation01.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestMultiRotation02.py b/src/SketchPlugin/Test/TestMultiRotation02.py index f959f1003..8d8c4ac6a 100644 --- a/src/SketchPlugin/Test/TestMultiRotation02.py +++ b/src/SketchPlugin/Test/TestMultiRotation02.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestOffset1.py b/src/SketchPlugin/Test/TestOffset1.py index 8b7fdecef..7a6d1e13d 100644 --- a/src/SketchPlugin/Test/TestOffset1.py +++ b/src/SketchPlugin/Test/TestOffset1.py @@ -55,7 +55,7 @@ def normalize(theDir): def checkOffset(theListIn, theListOut, theOutToIn, theDist, isReversed, nbIn, nbOut): TOL = 6.0e-5 - aNbIn = theListIn.size() + theListIn.size() aNbOut = theListOut.size() # print("**checkOffset**") diff --git a/src/SketchPlugin/Test/TestOffset3.py b/src/SketchPlugin/Test/TestOffset3.py index 3b03e4c8c..e4243eb33 100644 --- a/src/SketchPlugin/Test/TestOffset3.py +++ b/src/SketchPlugin/Test/TestOffset3.py @@ -18,7 +18,7 @@ # from salome.shaper import model -from SketchAPI import * +from SketchAPI import SketchAPI_Point model.begin() partSet = model.moduleDocument() diff --git a/src/SketchPlugin/Test/TestProjectionBSpline.py b/src/SketchPlugin/Test/TestProjectionBSpline.py index 1c8686952..147a8c816 100644 --- a/src/SketchPlugin/Test/TestProjectionBSpline.py +++ b/src/SketchPlugin/Test/TestProjectionBSpline.py @@ -62,7 +62,7 @@ model.do() model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_BSpline, GeomAPI_Curve, GeomAPI_Pnt import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestProjectionBSplinePeriodic.py b/src/SketchPlugin/Test/TestProjectionBSplinePeriodic.py index e5c4043d4..7f02856f1 100644 --- a/src/SketchPlugin/Test/TestProjectionBSplinePeriodic.py +++ b/src/SketchPlugin/Test/TestProjectionBSplinePeriodic.py @@ -62,7 +62,7 @@ model.do() model.end() -from GeomAPI import * +from GeomAPI import GeomAPI_BSpline, GeomAPI_Curve, GeomAPI_Pnt import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestProjectionIntoResult.py b/src/SketchPlugin/Test/TestProjectionIntoResult.py index 3f1120ca9..885e68062 100644 --- a/src/SketchPlugin/Test/TestProjectionIntoResult.py +++ b/src/SketchPlugin/Test/TestProjectionIntoResult.py @@ -23,7 +23,7 @@ """ from salome.shaper import model -from GeomAPI import * +from GeomAPI import GeomAPI_Shape # ============================================================================== # Auxiliary functions diff --git a/src/SketchPlugin/Test/TestRectangle1.py b/src/SketchPlugin/Test/TestRectangle1.py index 2233f5202..66184b9f3 100644 --- a/src/SketchPlugin/Test/TestRectangle1.py +++ b/src/SketchPlugin/Test/TestRectangle1.py @@ -25,7 +25,6 @@ from GeomDataAPI import * from ModelAPI import * from GeomAPI import * -import math from salome.shaper import model # ========================================================================= diff --git a/src/SketchPlugin/Test/TestRemoveBSpline.py b/src/SketchPlugin/Test/TestRemoveBSpline.py index 0cfc07b8d..c7dca43ef 100644 --- a/src/SketchPlugin/Test/TestRemoveBSpline.py +++ b/src/SketchPlugin/Test/TestRemoveBSpline.py @@ -22,7 +22,7 @@ """ from salome.shaper import model -from ModelAPI import * +from ModelAPI import FeatureSet, removeFeaturesAndReferences def assertNbSubs( diff --git a/src/SketchPlugin/Test/TestRemoveBSplinePeriodic.py b/src/SketchPlugin/Test/TestRemoveBSplinePeriodic.py index ffbf19875..d29be0db8 100644 --- a/src/SketchPlugin/Test/TestRemoveBSplinePeriodic.py +++ b/src/SketchPlugin/Test/TestRemoveBSplinePeriodic.py @@ -22,7 +22,7 @@ """ from salome.shaper import model -from ModelAPI import * +from ModelAPI import FeatureSet, removeFeaturesAndReferences def assertNbSubs( diff --git a/src/SketchPlugin/Test/TestRemoveEllipse.py b/src/SketchPlugin/Test/TestRemoveEllipse.py index 1f5925c07..09ba494f7 100644 --- a/src/SketchPlugin/Test/TestRemoveEllipse.py +++ b/src/SketchPlugin/Test/TestRemoveEllipse.py @@ -22,7 +22,7 @@ """ from salome.shaper import model -from ModelAPI import * +from ModelAPI import FeatureSet, removeFeaturesAndReferences def assertNbSubs( diff --git a/src/SketchPlugin/Test/TestRemoveEllipticArc.py b/src/SketchPlugin/Test/TestRemoveEllipticArc.py index 0c928cda9..f421effee 100644 --- a/src/SketchPlugin/Test/TestRemoveEllipticArc.py +++ b/src/SketchPlugin/Test/TestRemoveEllipticArc.py @@ -22,7 +22,7 @@ """ from salome.shaper import model -from ModelAPI import * +from ModelAPI import FeatureSet, removeFeaturesAndReferences def assertNbSubs( diff --git a/src/SketchPlugin/Test/TestSketchCopy01.py b/src/SketchPlugin/Test/TestSketchCopy01.py index 2e1ae0a54..8cdae5fa9 100644 --- a/src/SketchPlugin/Test/TestSketchCopy01.py +++ b/src/SketchPlugin/Test/TestSketchCopy01.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from salome.shaper import model diff --git a/src/SketchPlugin/Test/TestSnowflake.py b/src/SketchPlugin/Test/TestSnowflake.py index de2810732..d7c83b388 100644 --- a/src/SketchPlugin/Test/TestSnowflake.py +++ b/src/SketchPlugin/Test/TestSnowflake.py @@ -24,7 +24,6 @@ from GeomAPI import * from GeomDataAPI import * from ModelAPI import * import collections -import math import random diff --git a/src/SketchPlugin/Test/TestSplit.py b/src/SketchPlugin/Test/TestSplit.py index e03811fb7..80c70aaad 100644 --- a/src/SketchPlugin/Test/TestSplit.py +++ b/src/SketchPlugin/Test/TestSplit.py @@ -19,7 +19,12 @@ from salome.shaper import model -from ModelAPI import * +from ModelAPI import ( + FeatureList, + FeatureSet, + featureToCompositeFeature, + removeFeaturesAndReferences, +) from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom diff --git a/src/SketchPlugin/Test/TestTrimArc01.py b/src/SketchPlugin/Test/TestTrimArc01.py index c878a1dc5..dba5ed83f 100644 --- a/src/SketchPlugin/Test/TestTrimArc01.py +++ b/src/SketchPlugin/Test/TestTrimArc01.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimArc02.py b/src/SketchPlugin/Test/TestTrimArc02.py index 3b48ed902..aa1699d2e 100644 --- a/src/SketchPlugin/Test/TestTrimArc02.py +++ b/src/SketchPlugin/Test/TestTrimArc02.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimArc03.py b/src/SketchPlugin/Test/TestTrimArc03.py index b0f6410b1..c7fa6733f 100644 --- a/src/SketchPlugin/Test/TestTrimArc03.py +++ b/src/SketchPlugin/Test/TestTrimArc03.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimArc04.py b/src/SketchPlugin/Test/TestTrimArc04.py index 536cdd130..17b27071d 100644 --- a/src/SketchPlugin/Test/TestTrimArc04.py +++ b/src/SketchPlugin/Test/TestTrimArc04.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimArc05.py b/src/SketchPlugin/Test/TestTrimArc05.py index cdcbaf4ee..11683e85e 100644 --- a/src/SketchPlugin/Test/TestTrimArc05.py +++ b/src/SketchPlugin/Test/TestTrimArc05.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimArc06.py b/src/SketchPlugin/Test/TestTrimArc06.py index f3ef96800..15cb0057e 100644 --- a/src/SketchPlugin/Test/TestTrimArc06.py +++ b/src/SketchPlugin/Test/TestTrimArc06.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimArc07.py b/src/SketchPlugin/Test/TestTrimArc07.py index d53167e84..948b1afde 100644 --- a/src/SketchPlugin/Test/TestTrimArc07.py +++ b/src/SketchPlugin/Test/TestTrimArc07.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimCircle01.py b/src/SketchPlugin/Test/TestTrimCircle01.py index f1c909e1e..d3a2a74a6 100644 --- a/src/SketchPlugin/Test/TestTrimCircle01.py +++ b/src/SketchPlugin/Test/TestTrimCircle01.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimCircle02.py b/src/SketchPlugin/Test/TestTrimCircle02.py index a7c78e571..5abb9b608 100644 --- a/src/SketchPlugin/Test/TestTrimCircle02.py +++ b/src/SketchPlugin/Test/TestTrimCircle02.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimCircle03.py b/src/SketchPlugin/Test/TestTrimCircle03.py index 59aed2859..a5919e2c0 100644 --- a/src/SketchPlugin/Test/TestTrimCircle03.py +++ b/src/SketchPlugin/Test/TestTrimCircle03.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimCircle04.py b/src/SketchPlugin/Test/TestTrimCircle04.py index afd63c00e..4c56a953c 100644 --- a/src/SketchPlugin/Test/TestTrimCircle04.py +++ b/src/SketchPlugin/Test/TestTrimCircle04.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimCircle05.py b/src/SketchPlugin/Test/TestTrimCircle05.py index 68ea64a80..b8e1f06e8 100644 --- a/src/SketchPlugin/Test/TestTrimCircle05.py +++ b/src/SketchPlugin/Test/TestTrimCircle05.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimCircleAndArc01.py b/src/SketchPlugin/Test/TestTrimCircleAndArc01.py index 6624f87de..3fe98d36c 100644 --- a/src/SketchPlugin/Test/TestTrimCircleAndArc01.py +++ b/src/SketchPlugin/Test/TestTrimCircleAndArc01.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimLine01.py b/src/SketchPlugin/Test/TestTrimLine01.py index f5d0be6d3..04f8fba67 100644 --- a/src/SketchPlugin/Test/TestTrimLine01.py +++ b/src/SketchPlugin/Test/TestTrimLine01.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/src/SketchPlugin/Test/TestTrimLine02.py b/src/SketchPlugin/Test/TestTrimLine02.py index 31635f3c3..85e40d50b 100644 --- a/src/SketchPlugin/Test/TestTrimLine02.py +++ b/src/SketchPlugin/Test/TestTrimLine02.py @@ -23,7 +23,6 @@ from ModelAPI import * from GeomDataAPI import * from ModelGeomAlgo import ModelGeomAlgo_Point2D from salome.shaper import geom -import math TOLERANCE = 1.0e-7 diff --git a/test.compatibility/bobine_film_reel.py b/test.compatibility/bobine_film_reel.py index cdc8b7a5f..bb938d7c5 100644 --- a/test.compatibility/bobine_film_reel.py +++ b/test.compatibility/bobine_film_reel.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.compatibility/case24.py b/test.compatibility/case24.py index 7b38acaf0..6755e4135 100644 --- a/test.compatibility/case24.py +++ b/test.compatibility/case24.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.compatibility/ecran.py b/test.compatibility/ecran.py index 13668a81e..1c992ff52 100644 --- a/test.compatibility/ecran.py +++ b/test.compatibility/ecran.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.compatibility/piece_09.py b/test.compatibility/piece_09.py index 862d283c0..8c329e21d 100644 --- a/test.compatibility/piece_09.py +++ b/test.compatibility/piece_09.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.compatibility/plug.py b/test.compatibility/plug.py index c6007a247..fd2c22efa 100644 --- a/test.compatibility/plug.py +++ b/test.compatibility/plug.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/test.compatibility/sprocket.py b/test.compatibility/sprocket.py index 7bab0bf8e..485cd8e03 100644 --- a/test.compatibility/sprocket.py +++ b/test.compatibility/sprocket.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/test.hdfs/test_hdf.py b/test.hdfs/test_hdf.py index 896333eb0..c68de1d71 100644 --- a/test.hdfs/test_hdf.py +++ b/test.hdfs/test_hdf.py @@ -17,13 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import salome, salome_utils, os, sys +import salome +import salome_utils +import sys import SalomePyQt import unittest -import subprocess -import ModelHighAPI, ModelAPI, PartSetAPI +import ModelHighAPI +import ModelAPI +import PartSetAPI from GeomAPI import GeomAPI_Shape from salome.shaper import model @@ -35,7 +38,7 @@ class TestHDF(unittest.TestCase): def setUp(self): salome.standalone() salome.salome_init(self.testfile, embedded=1, forced=True) - myStudyName = salome.myStudy._get_Name() + salome.myStudy._get_Name() self.session = salome.naming_service.Resolve("/Kernel/Session") self.session.emitMessage("connect_to_study") diff --git a/test.hdfs/testme.py b/test.hdfs/testme.py index 62f44ae52..c74b06807 100644 --- a/test.hdfs/testme.py +++ b/test.hdfs/testme.py @@ -21,7 +21,6 @@ if __name__ == "__main__": import subprocess - from time import sleep import sys, os import tempfile diff --git a/test.models/bobine_film_reel.py b/test.models/bobine_film_reel.py index cb4d9615d..8a1ef09a9 100644 --- a/test.models/bobine_film_reel.py +++ b/test.models/bobine_film_reel.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.models/case24.py b/test.models/case24.py index db0daef91..879ee22ba 100644 --- a/test.models/case24.py +++ b/test.models/case24.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.models/ecran.py b/test.models/ecran.py index d00675462..a26d10345 100644 --- a/test.models/ecran.py +++ b/test.models/ecran.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.models/piece_09.py b/test.models/piece_09.py index 49a1398f0..990ad91c7 100644 --- a/test.models/piece_09.py +++ b/test.models/piece_09.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line from salome.shaper import model diff --git a/test.models/plug.py b/test.models/plug.py index 6b12c9e00..8d0e75bab 100644 --- a/test.models/plug.py +++ b/test.models/plug.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/test.models/sprocket.py b/test.models/sprocket.py index 8792a40f2..5141a30fe 100644 --- a/test.models/sprocket.py +++ b/test.models/sprocket.py @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from SketchAPI import * +from SketchAPI import SketchAPI_Line, SketchAPI_Point from GeomAPI import GeomAPI_Shape from salome.shaper import model diff --git a/test.squish/shared/scripts/common.py b/test.squish/shared/scripts/common.py index c4e6e4d8e..96aae4065 100644 --- a/test.squish/shared/scripts/common.py +++ b/test.squish/shared/scripts/common.py @@ -17,7 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import filecmp import os import shutil diff --git a/test.squish/suite_STANDALONE/tst_818/test.py b/test.squish/suite_STANDALONE/tst_818/test.py index 621d46e97..971fd96cc 100644 --- a/test.squish/suite_STANDALONE/tst_818/test.py +++ b/test.squish/suite_STANDALONE/tst_818/test.py @@ -17,8 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -import re - def main(): source(findFile("scripts", "common.py")) -- 2.39.2