From 8d33dd3a86bbcf751c5cab63d04f3158e31f9c76 Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Thu, 12 Aug 2021 08:43:44 +0200
Subject: [PATCH] Switch to SSL mode for tests : naive approach

---
 CTestTestfileInstall.cmake                            | 2 +-
 doc/salome/examples/3dsketcher.py                     | 2 +-
 doc/salome/examples/CTestTestfileInstall.cmake        | 2 +-
 doc/salome/examples/GEOM_Field.py                     | 2 +-
 doc/salome/examples/GEOM_box.py                       | 2 +-
 doc/salome/examples/advanced_geom_objs_ex01.py        | 2 +-
 doc/salome/examples/advanced_geom_objs_ex02.py        | 2 +-
 doc/salome/examples/advanced_geom_objs_ex03.py        | 2 +-
 doc/salome/examples/angle.py                          | 2 +-
 doc/salome/examples/arranging_study_objects.py        | 2 +-
 doc/salome/examples/basic_geom_objs_ex01.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex02.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex03.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex04.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex05.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex06.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex07.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex08.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex09.py           | 2 +-
 doc/salome/examples/basic_geom_objs_ex10.py           | 2 +-
 doc/salome/examples/basic_operations_ex01.py          | 2 +-
 doc/salome/examples/basic_operations_ex02.py          | 2 +-
 doc/salome/examples/basic_operations_ex03.py          | 2 +-
 doc/salome/examples/basic_operations_ex04.py          | 2 +-
 doc/salome/examples/basic_properties.py               | 2 +-
 doc/salome/examples/blocks_operations_ex01.py         | 2 +-
 doc/salome/examples/blocks_operations_ex02.py         | 2 +-
 doc/salome/examples/blocks_operations_ex03.py         | 2 +-
 doc/salome/examples/boolean_operations_ex01.py        | 2 +-
 doc/salome/examples/boolean_operations_ex02.py        | 2 +-
 doc/salome/examples/boolean_operations_ex03.py        | 2 +-
 doc/salome/examples/boolean_operations_ex04.py        | 2 +-
 doc/salome/examples/bounding_box.py                   | 2 +-
 doc/salome/examples/building_by_blocks_ex01.py        | 2 +-
 doc/salome/examples/building_by_blocks_ex02.py        | 2 +-
 doc/salome/examples/center_of_mass.py                 | 2 +-
 doc/salome/examples/check_compound_of_blocks.py       | 2 +-
 doc/salome/examples/check_self_intersections.py       | 2 +-
 doc/salome/examples/check_self_intersections_fast.py  | 2 +-
 doc/salome/examples/check_shape.py                    | 2 +-
 doc/salome/examples/complex_objs_ex01.py              | 2 +-
 doc/salome/examples/complex_objs_ex02.py              | 2 +-
 doc/salome/examples/complex_objs_ex03.py              | 2 +-
 doc/salome/examples/complex_objs_ex04.py              | 2 +-
 doc/salome/examples/complex_objs_ex05.py              | 2 +-
 doc/salome/examples/complex_objs_ex06.py              | 2 +-
 doc/salome/examples/complex_objs_ex07.py              | 2 +-
 doc/salome/examples/complex_objs_ex08.py              | 2 +-
 doc/salome/examples/complex_objs_ex09.py              | 2 +-
 doc/salome/examples/complex_objs_ex10.py              | 2 +-
 doc/salome/examples/complex_objs_ex11.py              | 2 +-
 doc/salome/examples/fast_intersection.py              | 2 +-
 doc/salome/examples/free_boundaries.py                | 2 +-
 doc/salome/examples/free_faces.py                     | 2 +-
 doc/salome/examples/get_non_blocks.py                 | 2 +-
 doc/salome/examples/import_export.py                  | 2 +-
 doc/salome/examples/inertia.py                        | 2 +-
 doc/salome/examples/min_distance.py                   | 2 +-
 doc/salome/examples/normal_face.py                    | 2 +-
 doc/salome/examples/notebook_geom.py                  | 2 +-
 doc/salome/examples/point_coordinates.py              | 2 +-
 doc/salome/examples/polyline.py                       | 2 +-
 doc/salome/examples/primitives_ex01.py                | 2 +-
 doc/salome/examples/primitives_ex02.py                | 2 +-
 doc/salome/examples/primitives_ex03.py                | 2 +-
 doc/salome/examples/primitives_ex04.py                | 2 +-
 doc/salome/examples/primitives_ex05.py                | 2 +-
 doc/salome/examples/primitives_ex06.py                | 2 +-
 doc/salome/examples/primitives_ex07.py                | 2 +-
 doc/salome/examples/repairing_operations_ex01.py      | 2 +-
 doc/salome/examples/repairing_operations_ex02.py      | 2 +-
 doc/salome/examples/repairing_operations_ex03.py      | 2 +-
 doc/salome/examples/repairing_operations_ex04.py      | 2 +-
 doc/salome/examples/repairing_operations_ex05.py      | 2 +-
 doc/salome/examples/repairing_operations_ex06.py      | 2 +-
 doc/salome/examples/repairing_operations_ex07.py      | 2 +-
 doc/salome/examples/repairing_operations_ex08.py      | 2 +-
 doc/salome/examples/repairing_operations_ex10.py      | 2 +-
 doc/salome/examples/repairing_operations_ex11.py      | 2 +-
 doc/salome/examples/repairing_operations_ex12.py      | 2 +-
 doc/salome/examples/sketcher.py                       | 2 +-
 doc/salome/examples/tolerance.py                      | 2 +-
 doc/salome/examples/topological_geom_objs_ex01.py     | 2 +-
 doc/salome/examples/topological_geom_objs_ex02.py     | 2 +-
 doc/salome/examples/topological_geom_objs_ex03.py     | 2 +-
 doc/salome/examples/topological_geom_objs_ex04.py     | 2 +-
 doc/salome/examples/topological_geom_objs_ex05.py     | 2 +-
 doc/salome/examples/topological_geom_objs_ex06.py     | 2 +-
 doc/salome/examples/transformation_operations_ex01.py | 2 +-
 doc/salome/examples/transformation_operations_ex02.py | 2 +-
 doc/salome/examples/transformation_operations_ex03.py | 2 +-
 doc/salome/examples/transformation_operations_ex04.py | 2 +-
 doc/salome/examples/transformation_operations_ex05.py | 2 +-
 doc/salome/examples/transformation_operations_ex06.py | 2 +-
 doc/salome/examples/transformation_operations_ex07.py | 2 +-
 doc/salome/examples/transformation_operations_ex08.py | 2 +-
 doc/salome/examples/transformation_operations_ex09.py | 2 +-
 doc/salome/examples/transformation_operations_ex10.py | 2 +-
 doc/salome/examples/transformation_operations_ex11.py | 2 +-
 doc/salome/examples/transformation_operations_ex12.py | 2 +-
 doc/salome/examples/transformation_operations_ex13.py | 2 +-
 doc/salome/examples/transformation_operations_ex14.py | 2 +-
 doc/salome/examples/viewing_geom_objs_ex01.py         | 2 +-
 doc/salome/examples/viewing_geom_objs_ex02.py         | 2 +-
 doc/salome/examples/viewing_geom_objs_ex03.py         | 2 +-
 doc/salome/examples/viewing_geom_objs_ex04.py         | 2 +-
 doc/salome/examples/whatis.py                         | 2 +-
 doc/salome/examples/working_with_groups_ex01.py       | 2 +-
 doc/salome/examples/working_with_groups_ex02.py       | 2 +-
 doc/salome/examples/working_with_groups_ex03.py       | 2 +-
 doc/salome/examples/working_with_groups_ex04.py       | 2 +-
 doc/salome/examples/working_with_groups_ex05.py       | 2 +-
 doc/salome/examples/working_with_groups_ex06.py       | 2 +-
 src/XAO/tests/CTestTestfileInstall.cmake              | 2 +-
 114 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/CTestTestfileInstall.cmake b/CTestTestfileInstall.cmake
index ad330def5..ed7c74822 100644
--- a/CTestTestfileInstall.cmake
+++ b/CTestTestfileInstall.cmake
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(SALOME_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py")
+SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py")
 
 SET(COMPONENT_NAME GEOM)
 SET(TIMEOUT        300)
diff --git a/doc/salome/examples/3dsketcher.py b/doc/salome/examples/3dsketcher.py
index 913c7d51d..4b7e35adb 100644
--- a/doc/salome/examples/3dsketcher.py
+++ b/doc/salome/examples/3dsketcher.py
@@ -1,7 +1,7 @@
 # 3D Sketcher
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/CTestTestfileInstall.cmake b/doc/salome/examples/CTestTestfileInstall.cmake
index d80d6aaaa..324ae5ba4 100644
--- a/doc/salome/examples/CTestTestfileInstall.cmake
+++ b/doc/salome/examples/CTestTestfileInstall.cmake
@@ -22,6 +22,6 @@ INCLUDE(tests.set)
 FOREACH(tfile ${GOOD_TESTS})
   GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
   SET(TEST_NAME GEOM_${BASE_NAME})
-  ADD_TEST(${TEST_NAME} python ${SALOME_TEST_DRIVER} ${TIMEOUT} ${tfile})
+  ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${tfile})
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES LABELS "${COMPONENT_NAME}")
 ENDFOREACH()
diff --git a/doc/salome/examples/GEOM_Field.py b/doc/salome/examples/GEOM_Field.py
index 537e21ef2..a47c6ff2b 100644
--- a/doc/salome/examples/GEOM_Field.py
+++ b/doc/salome/examples/GEOM_Field.py
@@ -1,7 +1,7 @@
 # Geom Field
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/GEOM_box.py b/doc/salome/examples/GEOM_box.py
index b697e6f79..487ad0bbc 100644
--- a/doc/salome/examples/GEOM_box.py
+++ b/doc/salome/examples/GEOM_box.py
@@ -1,6 +1,6 @@
 # --- salome initialization
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 
 # --- geom Python interface
 import GEOM
diff --git a/doc/salome/examples/advanced_geom_objs_ex01.py b/doc/salome/examples/advanced_geom_objs_ex01.py
index fea605c3d..0b67dc1e1 100644
--- a/doc/salome/examples/advanced_geom_objs_ex01.py
+++ b/doc/salome/examples/advanced_geom_objs_ex01.py
@@ -1,7 +1,7 @@
 # Creation of PipeTShape
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/advanced_geom_objs_ex02.py b/doc/salome/examples/advanced_geom_objs_ex02.py
index 452728a5a..ec95454e8 100644
--- a/doc/salome/examples/advanced_geom_objs_ex02.py
+++ b/doc/salome/examples/advanced_geom_objs_ex02.py
@@ -1,7 +1,7 @@
 # Creation of DividedDisk
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/advanced_geom_objs_ex03.py b/doc/salome/examples/advanced_geom_objs_ex03.py
index d49d5db37..f1056ad6e 100644
--- a/doc/salome/examples/advanced_geom_objs_ex03.py
+++ b/doc/salome/examples/advanced_geom_objs_ex03.py
@@ -1,7 +1,7 @@
 # Creation of DividedCylinder
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/angle.py b/doc/salome/examples/angle.py
index 0c787acd6..ddaa4eb83 100644
--- a/doc/salome/examples/angle.py
+++ b/doc/salome/examples/angle.py
@@ -1,7 +1,7 @@
 # Angle
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/arranging_study_objects.py b/doc/salome/examples/arranging_study_objects.py
index f131d6b1c..b8871ed7d 100644
--- a/doc/salome/examples/arranging_study_objects.py
+++ b/doc/salome/examples/arranging_study_objects.py
@@ -1,7 +1,7 @@
 # Using SALOME NoteBook
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 
 import GEOM
 from salome.geom import geomBuilder
diff --git a/doc/salome/examples/basic_geom_objs_ex01.py b/doc/salome/examples/basic_geom_objs_ex01.py
index 22c5236cf..d835f3836 100644
--- a/doc/salome/examples/basic_geom_objs_ex01.py
+++ b/doc/salome/examples/basic_geom_objs_ex01.py
@@ -1,7 +1,7 @@
 # Creation of a Point
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex02.py b/doc/salome/examples/basic_geom_objs_ex02.py
index 3175f2ee0..5c89aac60 100644
--- a/doc/salome/examples/basic_geom_objs_ex02.py
+++ b/doc/salome/examples/basic_geom_objs_ex02.py
@@ -1,7 +1,7 @@
 # Creation of a Line
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex03.py b/doc/salome/examples/basic_geom_objs_ex03.py
index 0e01764db..20a859593 100644
--- a/doc/salome/examples/basic_geom_objs_ex03.py
+++ b/doc/salome/examples/basic_geom_objs_ex03.py
@@ -1,7 +1,7 @@
 # Creation of a Circle
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex04.py b/doc/salome/examples/basic_geom_objs_ex04.py
index 0cef7779f..95d4e8254 100644
--- a/doc/salome/examples/basic_geom_objs_ex04.py
+++ b/doc/salome/examples/basic_geom_objs_ex04.py
@@ -1,7 +1,7 @@
 # Creation of an Ellipse
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex05.py b/doc/salome/examples/basic_geom_objs_ex05.py
index ff0f80139..7f4d92c54 100644
--- a/doc/salome/examples/basic_geom_objs_ex05.py
+++ b/doc/salome/examples/basic_geom_objs_ex05.py
@@ -1,7 +1,7 @@
 # Creation of an Arc
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex06.py b/doc/salome/examples/basic_geom_objs_ex06.py
index ad115fc13..5eb144859 100644
--- a/doc/salome/examples/basic_geom_objs_ex06.py
+++ b/doc/salome/examples/basic_geom_objs_ex06.py
@@ -1,7 +1,7 @@
 # Creation of a Curve
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex07.py b/doc/salome/examples/basic_geom_objs_ex07.py
index 1bceed568..6cd6372bc 100644
--- a/doc/salome/examples/basic_geom_objs_ex07.py
+++ b/doc/salome/examples/basic_geom_objs_ex07.py
@@ -1,7 +1,7 @@
 # Creation of a Vector
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex08.py b/doc/salome/examples/basic_geom_objs_ex08.py
index 5826e52d0..56c1ae3d5 100644
--- a/doc/salome/examples/basic_geom_objs_ex08.py
+++ b/doc/salome/examples/basic_geom_objs_ex08.py
@@ -1,7 +1,7 @@
 # Creation of a Plane
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex09.py b/doc/salome/examples/basic_geom_objs_ex09.py
index c1afcfc7f..e96763764 100644
--- a/doc/salome/examples/basic_geom_objs_ex09.py
+++ b/doc/salome/examples/basic_geom_objs_ex09.py
@@ -1,7 +1,7 @@
 # Creation of a Local Coordinate System
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_geom_objs_ex10.py b/doc/salome/examples/basic_geom_objs_ex10.py
index 2b994f8a7..7e20b9021 100644
--- a/doc/salome/examples/basic_geom_objs_ex10.py
+++ b/doc/salome/examples/basic_geom_objs_ex10.py
@@ -1,7 +1,7 @@
 # Creation of a Surface From Face
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_operations_ex01.py b/doc/salome/examples/basic_operations_ex01.py
index b0c63593b..0935d119a 100644
--- a/doc/salome/examples/basic_operations_ex01.py
+++ b/doc/salome/examples/basic_operations_ex01.py
@@ -1,7 +1,7 @@
 # Partition
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_operations_ex02.py b/doc/salome/examples/basic_operations_ex02.py
index a9a76e883..afb495393 100644
--- a/doc/salome/examples/basic_operations_ex02.py
+++ b/doc/salome/examples/basic_operations_ex02.py
@@ -1,7 +1,7 @@
 # Archimede
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_operations_ex03.py b/doc/salome/examples/basic_operations_ex03.py
index 2f7c4e350..e49a0c755 100644
--- a/doc/salome/examples/basic_operations_ex03.py
+++ b/doc/salome/examples/basic_operations_ex03.py
@@ -1,7 +1,7 @@
 # Restore presentation parameters and sub-shapes
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_operations_ex04.py b/doc/salome/examples/basic_operations_ex04.py
index 61d8e2454..eff130c4b 100644
--- a/doc/salome/examples/basic_operations_ex04.py
+++ b/doc/salome/examples/basic_operations_ex04.py
@@ -1,7 +1,7 @@
 # Get shared sub-shapes
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/basic_properties.py b/doc/salome/examples/basic_properties.py
index b00a2d6a6..744eb4304 100644
--- a/doc/salome/examples/basic_properties.py
+++ b/doc/salome/examples/basic_properties.py
@@ -1,7 +1,7 @@
 # Basic Properties
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/blocks_operations_ex01.py b/doc/salome/examples/blocks_operations_ex01.py
index 46264a62f..298efa14b 100644
--- a/doc/salome/examples/blocks_operations_ex01.py
+++ b/doc/salome/examples/blocks_operations_ex01.py
@@ -1,7 +1,7 @@
 # Multi Transformation
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/blocks_operations_ex02.py b/doc/salome/examples/blocks_operations_ex02.py
index 41f0c1f44..4c7698472 100644
--- a/doc/salome/examples/blocks_operations_ex02.py
+++ b/doc/salome/examples/blocks_operations_ex02.py
@@ -1,7 +1,7 @@
 # Explode on Blocks
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/blocks_operations_ex03.py b/doc/salome/examples/blocks_operations_ex03.py
index e74bb5af1..2a00798f8 100644
--- a/doc/salome/examples/blocks_operations_ex03.py
+++ b/doc/salome/examples/blocks_operations_ex03.py
@@ -1,7 +1,7 @@
 # Propagate
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/boolean_operations_ex01.py b/doc/salome/examples/boolean_operations_ex01.py
index 2557639e0..c558bf16e 100644
--- a/doc/salome/examples/boolean_operations_ex01.py
+++ b/doc/salome/examples/boolean_operations_ex01.py
@@ -1,7 +1,7 @@
 # Fuse
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/boolean_operations_ex02.py b/doc/salome/examples/boolean_operations_ex02.py
index 58d5bb6f2..b37e081ec 100644
--- a/doc/salome/examples/boolean_operations_ex02.py
+++ b/doc/salome/examples/boolean_operations_ex02.py
@@ -1,7 +1,7 @@
 # Common
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/boolean_operations_ex03.py b/doc/salome/examples/boolean_operations_ex03.py
index d0a80b388..1dbf5dfe9 100644
--- a/doc/salome/examples/boolean_operations_ex03.py
+++ b/doc/salome/examples/boolean_operations_ex03.py
@@ -1,7 +1,7 @@
 # Cut
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/boolean_operations_ex04.py b/doc/salome/examples/boolean_operations_ex04.py
index e5bbb1c50..1fd7825f4 100644
--- a/doc/salome/examples/boolean_operations_ex04.py
+++ b/doc/salome/examples/boolean_operations_ex04.py
@@ -1,7 +1,7 @@
 # Section
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/bounding_box.py b/doc/salome/examples/bounding_box.py
index 337c62e56..eb48346f0 100644
--- a/doc/salome/examples/bounding_box.py
+++ b/doc/salome/examples/bounding_box.py
@@ -1,7 +1,7 @@
 # Bounding Box
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/building_by_blocks_ex01.py b/doc/salome/examples/building_by_blocks_ex01.py
index b7f32c323..869303626 100644
--- a/doc/salome/examples/building_by_blocks_ex01.py
+++ b/doc/salome/examples/building_by_blocks_ex01.py
@@ -1,7 +1,7 @@
 # Quadrangle Face
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/building_by_blocks_ex02.py b/doc/salome/examples/building_by_blocks_ex02.py
index 724381b72..00269feda 100644
--- a/doc/salome/examples/building_by_blocks_ex02.py
+++ b/doc/salome/examples/building_by_blocks_ex02.py
@@ -1,7 +1,7 @@
 # Hexagonal Solid
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/center_of_mass.py b/doc/salome/examples/center_of_mass.py
index bec926a82..26ad44d37 100644
--- a/doc/salome/examples/center_of_mass.py
+++ b/doc/salome/examples/center_of_mass.py
@@ -1,7 +1,7 @@
 # Center of masses
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/check_compound_of_blocks.py b/doc/salome/examples/check_compound_of_blocks.py
index c2a9a04d6..3a62a8d8b 100644
--- a/doc/salome/examples/check_compound_of_blocks.py
+++ b/doc/salome/examples/check_compound_of_blocks.py
@@ -1,7 +1,7 @@
 # Check Compound of Blocks
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/check_self_intersections.py b/doc/salome/examples/check_self_intersections.py
index c8aefd383..811f55733 100644
--- a/doc/salome/examples/check_self_intersections.py
+++ b/doc/salome/examples/check_self_intersections.py
@@ -1,7 +1,7 @@
 # Detect Self-intersections
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/check_self_intersections_fast.py b/doc/salome/examples/check_self_intersections_fast.py
index 5d72d91bd..9f646ac54 100644
--- a/doc/salome/examples/check_self_intersections_fast.py
+++ b/doc/salome/examples/check_self_intersections_fast.py
@@ -1,7 +1,7 @@
 # Detect Self-intersections fast
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/check_shape.py b/doc/salome/examples/check_shape.py
index da0a107b0..c9ef82704 100644
--- a/doc/salome/examples/check_shape.py
+++ b/doc/salome/examples/check_shape.py
@@ -1,7 +1,7 @@
 # Check Shape
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex01.py b/doc/salome/examples/complex_objs_ex01.py
index 1eb8c4f80..996368294 100644
--- a/doc/salome/examples/complex_objs_ex01.py
+++ b/doc/salome/examples/complex_objs_ex01.py
@@ -1,7 +1,7 @@
 # Creation of a Prism
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex02.py b/doc/salome/examples/complex_objs_ex02.py
index 046ddbb18..7907d7b18 100644
--- a/doc/salome/examples/complex_objs_ex02.py
+++ b/doc/salome/examples/complex_objs_ex02.py
@@ -1,7 +1,7 @@
 # Creation of a Revolution
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex03.py b/doc/salome/examples/complex_objs_ex03.py
index 5edd9725e..a9cc9b95c 100644
--- a/doc/salome/examples/complex_objs_ex03.py
+++ b/doc/salome/examples/complex_objs_ex03.py
@@ -1,7 +1,7 @@
 # Creation of a Filling
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex04.py b/doc/salome/examples/complex_objs_ex04.py
index de7e29421..48830bf81 100644
--- a/doc/salome/examples/complex_objs_ex04.py
+++ b/doc/salome/examples/complex_objs_ex04.py
@@ -1,7 +1,7 @@
 # Creation of a Pipe
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex05.py b/doc/salome/examples/complex_objs_ex05.py
index c1017173e..011f791d1 100644
--- a/doc/salome/examples/complex_objs_ex05.py
+++ b/doc/salome/examples/complex_objs_ex05.py
@@ -1,7 +1,7 @@
 # Creation of a PipeWithDifferentSections
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex06.py b/doc/salome/examples/complex_objs_ex06.py
index 019b13a44..4ea7223f8 100644
--- a/doc/salome/examples/complex_objs_ex06.py
+++ b/doc/salome/examples/complex_objs_ex06.py
@@ -1,7 +1,7 @@
 # Creation of a PipeWithShellSections
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex07.py b/doc/salome/examples/complex_objs_ex07.py
index 0643748bf..4ac53d28b 100644
--- a/doc/salome/examples/complex_objs_ex07.py
+++ b/doc/salome/examples/complex_objs_ex07.py
@@ -1,7 +1,7 @@
 # Creation of a PipeShellsWithoutPath
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex08.py b/doc/salome/examples/complex_objs_ex08.py
index 0e2065abb..e2d4f50e5 100644
--- a/doc/salome/examples/complex_objs_ex08.py
+++ b/doc/salome/examples/complex_objs_ex08.py
@@ -1,6 +1,6 @@
 # Creation of a PipeBiNormalAlongVector
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex09.py b/doc/salome/examples/complex_objs_ex09.py
index 6c6c3d868..830b7ff34 100644
--- a/doc/salome/examples/complex_objs_ex09.py
+++ b/doc/salome/examples/complex_objs_ex09.py
@@ -1,7 +1,7 @@
 # Creation of a Middle Path
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex10.py b/doc/salome/examples/complex_objs_ex10.py
index ad5c8c8e9..ffcb45368 100644
--- a/doc/salome/examples/complex_objs_ex10.py
+++ b/doc/salome/examples/complex_objs_ex10.py
@@ -1,7 +1,7 @@
 # Creation of Tangent Plane On Face
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/complex_objs_ex11.py b/doc/salome/examples/complex_objs_ex11.py
index 6f5295a18..9ccf65999 100644
--- a/doc/salome/examples/complex_objs_ex11.py
+++ b/doc/salome/examples/complex_objs_ex11.py
@@ -1,7 +1,7 @@
 # Apply thickness for shell
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/fast_intersection.py b/doc/salome/examples/fast_intersection.py
index 407c993d5..7894aaae2 100644
--- a/doc/salome/examples/fast_intersection.py
+++ b/doc/salome/examples/fast_intersection.py
@@ -1,7 +1,7 @@
 # Fast intersection
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/free_boundaries.py b/doc/salome/examples/free_boundaries.py
index 1ae412a8e..75cdd2e83 100644
--- a/doc/salome/examples/free_boundaries.py
+++ b/doc/salome/examples/free_boundaries.py
@@ -1,7 +1,7 @@
 # Check Free Boundaries
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
 
diff --git a/doc/salome/examples/free_faces.py b/doc/salome/examples/free_faces.py
index c1d79c964..cdc01fcb8 100644
--- a/doc/salome/examples/free_faces.py
+++ b/doc/salome/examples/free_faces.py
@@ -1,7 +1,7 @@
 # Check Free Faces
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/get_non_blocks.py b/doc/salome/examples/get_non_blocks.py
index 6886506fe..168ad81d4 100644
--- a/doc/salome/examples/get_non_blocks.py
+++ b/doc/salome/examples/get_non_blocks.py
@@ -1,7 +1,7 @@
 # Get Non Blocks
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/import_export.py b/doc/salome/examples/import_export.py
index 18db87609..e01203890 100644
--- a/doc/salome/examples/import_export.py
+++ b/doc/salome/examples/import_export.py
@@ -1,7 +1,7 @@
 # Import/Export
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/inertia.py b/doc/salome/examples/inertia.py
index e237fc5c7..aa89179d9 100644
--- a/doc/salome/examples/inertia.py
+++ b/doc/salome/examples/inertia.py
@@ -1,7 +1,7 @@
 # Inertia
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/min_distance.py b/doc/salome/examples/min_distance.py
index f6229cada..aed446c6a 100644
--- a/doc/salome/examples/min_distance.py
+++ b/doc/salome/examples/min_distance.py
@@ -1,7 +1,7 @@
 # Minimal Distance
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/normal_face.py b/doc/salome/examples/normal_face.py
index 2b6e34e02..79ae725c5 100644
--- a/doc/salome/examples/normal_face.py
+++ b/doc/salome/examples/normal_face.py
@@ -1,7 +1,7 @@
 # Normal to a Face
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/notebook_geom.py b/doc/salome/examples/notebook_geom.py
index 514357983..804de50e4 100644
--- a/doc/salome/examples/notebook_geom.py
+++ b/doc/salome/examples/notebook_geom.py
@@ -1,7 +1,7 @@
 # Using SALOME NoteBook
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/point_coordinates.py b/doc/salome/examples/point_coordinates.py
index e8dd9565e..65a5ab61a 100644
--- a/doc/salome/examples/point_coordinates.py
+++ b/doc/salome/examples/point_coordinates.py
@@ -1,7 +1,7 @@
 # Point Coordinates
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/polyline.py b/doc/salome/examples/polyline.py
index eae5272b5..a76c05900 100644
--- a/doc/salome/examples/polyline.py
+++ b/doc/salome/examples/polyline.py
@@ -1,7 +1,7 @@
 # 2D polyline
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/primitives_ex01.py b/doc/salome/examples/primitives_ex01.py
index d13fa571f..d9922b6e8 100644
--- a/doc/salome/examples/primitives_ex01.py
+++ b/doc/salome/examples/primitives_ex01.py
@@ -1,7 +1,7 @@
 # Creation of a Box
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/primitives_ex02.py b/doc/salome/examples/primitives_ex02.py
index 6136ddbdf..d42c53973 100644
--- a/doc/salome/examples/primitives_ex02.py
+++ b/doc/salome/examples/primitives_ex02.py
@@ -3,7 +3,7 @@
 import math
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/primitives_ex03.py b/doc/salome/examples/primitives_ex03.py
index 8f93750c5..f4994fb35 100644
--- a/doc/salome/examples/primitives_ex03.py
+++ b/doc/salome/examples/primitives_ex03.py
@@ -1,7 +1,7 @@
 # Creation of a Sphere
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/primitives_ex04.py b/doc/salome/examples/primitives_ex04.py
index 4f51dd6d4..17329454d 100644
--- a/doc/salome/examples/primitives_ex04.py
+++ b/doc/salome/examples/primitives_ex04.py
@@ -1,7 +1,7 @@
 # Creation of a Torus
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/primitives_ex05.py b/doc/salome/examples/primitives_ex05.py
index bb3b245f1..072ef1855 100644
--- a/doc/salome/examples/primitives_ex05.py
+++ b/doc/salome/examples/primitives_ex05.py
@@ -1,7 +1,7 @@
 # Creation of a Cone
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/primitives_ex06.py b/doc/salome/examples/primitives_ex06.py
index 977fe4fb9..6ad1bf57e 100644
--- a/doc/salome/examples/primitives_ex06.py
+++ b/doc/salome/examples/primitives_ex06.py
@@ -1,7 +1,7 @@
 # Creation of a Disk
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/primitives_ex07.py b/doc/salome/examples/primitives_ex07.py
index a4de96ea6..ce8825d48 100644
--- a/doc/salome/examples/primitives_ex07.py
+++ b/doc/salome/examples/primitives_ex07.py
@@ -1,7 +1,7 @@
 # Creation of a Rectangle
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex01.py b/doc/salome/examples/repairing_operations_ex01.py
index be00007a8..3d595501b 100644
--- a/doc/salome/examples/repairing_operations_ex01.py
+++ b/doc/salome/examples/repairing_operations_ex01.py
@@ -1,7 +1,7 @@
 # Shape Processing
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex02.py b/doc/salome/examples/repairing_operations_ex02.py
index 6dc223afb..5882ab5a3 100644
--- a/doc/salome/examples/repairing_operations_ex02.py
+++ b/doc/salome/examples/repairing_operations_ex02.py
@@ -1,7 +1,7 @@
 # Suppress Faces
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex03.py b/doc/salome/examples/repairing_operations_ex03.py
index a0854226c..daf2b4ee8 100644
--- a/doc/salome/examples/repairing_operations_ex03.py
+++ b/doc/salome/examples/repairing_operations_ex03.py
@@ -1,7 +1,7 @@
 # Close Contour
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex04.py b/doc/salome/examples/repairing_operations_ex04.py
index 55971195d..92de94e5d 100644
--- a/doc/salome/examples/repairing_operations_ex04.py
+++ b/doc/salome/examples/repairing_operations_ex04.py
@@ -1,7 +1,7 @@
 # Suppress Internal Wires
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex05.py b/doc/salome/examples/repairing_operations_ex05.py
index c8da39d13..a0b251b02 100644
--- a/doc/salome/examples/repairing_operations_ex05.py
+++ b/doc/salome/examples/repairing_operations_ex05.py
@@ -1,7 +1,7 @@
 # Suppress Holes
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex06.py b/doc/salome/examples/repairing_operations_ex06.py
index 95168fc4a..f6e7a5e31 100644
--- a/doc/salome/examples/repairing_operations_ex06.py
+++ b/doc/salome/examples/repairing_operations_ex06.py
@@ -1,7 +1,7 @@
 # Sewing
 
 import salome, math
-salome.salome_init()
+salome.salome_init_without_session()
 from salome.geom import geomBuilder
 
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex07.py b/doc/salome/examples/repairing_operations_ex07.py
index 66a0c0e94..9e3cf939e 100644
--- a/doc/salome/examples/repairing_operations_ex07.py
+++ b/doc/salome/examples/repairing_operations_ex07.py
@@ -1,7 +1,7 @@
 # Glue Faces
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex08.py b/doc/salome/examples/repairing_operations_ex08.py
index 046332af4..a4058c3e0 100644
--- a/doc/salome/examples/repairing_operations_ex08.py
+++ b/doc/salome/examples/repairing_operations_ex08.py
@@ -1,7 +1,7 @@
 # Glue Edges
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex10.py b/doc/salome/examples/repairing_operations_ex10.py
index 399a22f93..4a688d767 100644
--- a/doc/salome/examples/repairing_operations_ex10.py
+++ b/doc/salome/examples/repairing_operations_ex10.py
@@ -1,7 +1,7 @@
 # Add Point on Edge
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex11.py b/doc/salome/examples/repairing_operations_ex11.py
index 6aae32a81..a74bc7411 100644
--- a/doc/salome/examples/repairing_operations_ex11.py
+++ b/doc/salome/examples/repairing_operations_ex11.py
@@ -1,7 +1,7 @@
 # Fuse Collinear Edges within a Wire
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/repairing_operations_ex12.py b/doc/salome/examples/repairing_operations_ex12.py
index 4218d85d4..6171a2317 100644
--- a/doc/salome/examples/repairing_operations_ex12.py
+++ b/doc/salome/examples/repairing_operations_ex12.py
@@ -1,7 +1,7 @@
 # Remove internal(shared) faces from a compound
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/sketcher.py b/doc/salome/examples/sketcher.py
index 197ecd01e..ea4bacec3 100644
--- a/doc/salome/examples/sketcher.py
+++ b/doc/salome/examples/sketcher.py
@@ -1,7 +1,7 @@
 # 2D Sketcher
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/tolerance.py b/doc/salome/examples/tolerance.py
index 9f001e837..41c365a8d 100644
--- a/doc/salome/examples/tolerance.py
+++ b/doc/salome/examples/tolerance.py
@@ -1,7 +1,7 @@
 # Tolerance
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/topological_geom_objs_ex01.py b/doc/salome/examples/topological_geom_objs_ex01.py
index ead4e3a8e..1dac881be 100644
--- a/doc/salome/examples/topological_geom_objs_ex01.py
+++ b/doc/salome/examples/topological_geom_objs_ex01.py
@@ -1,7 +1,7 @@
 # Creation of an Edge
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/topological_geom_objs_ex02.py b/doc/salome/examples/topological_geom_objs_ex02.py
index b3b1c8e70..5e1c28497 100644
--- a/doc/salome/examples/topological_geom_objs_ex02.py
+++ b/doc/salome/examples/topological_geom_objs_ex02.py
@@ -1,7 +1,7 @@
 # Creation of a Wire
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/topological_geom_objs_ex03.py b/doc/salome/examples/topological_geom_objs_ex03.py
index 1f03e6251..a99f52369 100644
--- a/doc/salome/examples/topological_geom_objs_ex03.py
+++ b/doc/salome/examples/topological_geom_objs_ex03.py
@@ -1,7 +1,7 @@
 # Creation of a Face
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/topological_geom_objs_ex04.py b/doc/salome/examples/topological_geom_objs_ex04.py
index 727e428e4..d6bd73ad3 100644
--- a/doc/salome/examples/topological_geom_objs_ex04.py
+++ b/doc/salome/examples/topological_geom_objs_ex04.py
@@ -1,7 +1,7 @@
 # Creation of a Shell
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/topological_geom_objs_ex05.py b/doc/salome/examples/topological_geom_objs_ex05.py
index 891ffe7a4..51e575da7 100644
--- a/doc/salome/examples/topological_geom_objs_ex05.py
+++ b/doc/salome/examples/topological_geom_objs_ex05.py
@@ -1,7 +1,7 @@
 # Creation of a Solid
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/topological_geom_objs_ex06.py b/doc/salome/examples/topological_geom_objs_ex06.py
index 819ad31c5..8e4505a50 100644
--- a/doc/salome/examples/topological_geom_objs_ex06.py
+++ b/doc/salome/examples/topological_geom_objs_ex06.py
@@ -1,7 +1,7 @@
 # Creation of a Compound
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex01.py b/doc/salome/examples/transformation_operations_ex01.py
index 1de25e6cc..2e3288d23 100644
--- a/doc/salome/examples/transformation_operations_ex01.py
+++ b/doc/salome/examples/transformation_operations_ex01.py
@@ -1,7 +1,7 @@
 # Translation
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex02.py b/doc/salome/examples/transformation_operations_ex02.py
index 5be970784..a0243a8e2 100644
--- a/doc/salome/examples/transformation_operations_ex02.py
+++ b/doc/salome/examples/transformation_operations_ex02.py
@@ -1,7 +1,7 @@
 # Rotation
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex03.py b/doc/salome/examples/transformation_operations_ex03.py
index 56c742857..679c60bdb 100644
--- a/doc/salome/examples/transformation_operations_ex03.py
+++ b/doc/salome/examples/transformation_operations_ex03.py
@@ -1,7 +1,7 @@
 # Modify Location
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex04.py b/doc/salome/examples/transformation_operations_ex04.py
index 8748d11e2..b396c2af4 100644
--- a/doc/salome/examples/transformation_operations_ex04.py
+++ b/doc/salome/examples/transformation_operations_ex04.py
@@ -1,7 +1,7 @@
 # Mirror Image
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex05.py b/doc/salome/examples/transformation_operations_ex05.py
index dc4950433..1a6bd44f9 100644
--- a/doc/salome/examples/transformation_operations_ex05.py
+++ b/doc/salome/examples/transformation_operations_ex05.py
@@ -1,7 +1,7 @@
 # Scale Transform
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex06.py b/doc/salome/examples/transformation_operations_ex06.py
index 54871e6c1..16bff16e1 100644
--- a/doc/salome/examples/transformation_operations_ex06.py
+++ b/doc/salome/examples/transformation_operations_ex06.py
@@ -1,7 +1,7 @@
 # Offset Surface
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex07.py b/doc/salome/examples/transformation_operations_ex07.py
index d134c1dfa..03d8ea51d 100644
--- a/doc/salome/examples/transformation_operations_ex07.py
+++ b/doc/salome/examples/transformation_operations_ex07.py
@@ -1,7 +1,7 @@
 # Projection
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
 
diff --git a/doc/salome/examples/transformation_operations_ex08.py b/doc/salome/examples/transformation_operations_ex08.py
index b4428a979..5938db628 100644
--- a/doc/salome/examples/transformation_operations_ex08.py
+++ b/doc/salome/examples/transformation_operations_ex08.py
@@ -1,7 +1,7 @@
 # Multi Translation
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex09.py b/doc/salome/examples/transformation_operations_ex09.py
index ee64361d3..7b7e4950a 100644
--- a/doc/salome/examples/transformation_operations_ex09.py
+++ b/doc/salome/examples/transformation_operations_ex09.py
@@ -1,7 +1,7 @@
 # Multi Rotation
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex10.py b/doc/salome/examples/transformation_operations_ex10.py
index d05d7026c..ba2382117 100644
--- a/doc/salome/examples/transformation_operations_ex10.py
+++ b/doc/salome/examples/transformation_operations_ex10.py
@@ -1,7 +1,7 @@
 # Fillet 2D
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex11.py b/doc/salome/examples/transformation_operations_ex11.py
index 7d60f45e9..6bc7c8405 100644
--- a/doc/salome/examples/transformation_operations_ex11.py
+++ b/doc/salome/examples/transformation_operations_ex11.py
@@ -1,7 +1,7 @@
 # Fillet 1D
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex12.py b/doc/salome/examples/transformation_operations_ex12.py
index b7c864637..edb5db277 100644
--- a/doc/salome/examples/transformation_operations_ex12.py
+++ b/doc/salome/examples/transformation_operations_ex12.py
@@ -1,7 +1,7 @@
 # Fillet
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex13.py b/doc/salome/examples/transformation_operations_ex13.py
index 66d9ef421..570b5ac35 100644
--- a/doc/salome/examples/transformation_operations_ex13.py
+++ b/doc/salome/examples/transformation_operations_ex13.py
@@ -1,7 +1,7 @@
 # Chamfer
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/transformation_operations_ex14.py b/doc/salome/examples/transformation_operations_ex14.py
index 4d3b4f24d..68cc670f1 100644
--- a/doc/salome/examples/transformation_operations_ex14.py
+++ b/doc/salome/examples/transformation_operations_ex14.py
@@ -1,7 +1,7 @@
 # Extend Edge and Face
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/viewing_geom_objs_ex01.py b/doc/salome/examples/viewing_geom_objs_ex01.py
index 3a21aec0c..a2aee66e7 100644
--- a/doc/salome/examples/viewing_geom_objs_ex01.py
+++ b/doc/salome/examples/viewing_geom_objs_ex01.py
@@ -1,7 +1,7 @@
 # Changing Display Mode
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/viewing_geom_objs_ex02.py b/doc/salome/examples/viewing_geom_objs_ex02.py
index 44859418e..bf16167ab 100644
--- a/doc/salome/examples/viewing_geom_objs_ex02.py
+++ b/doc/salome/examples/viewing_geom_objs_ex02.py
@@ -1,7 +1,7 @@
 # Changing Color
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/viewing_geom_objs_ex03.py b/doc/salome/examples/viewing_geom_objs_ex03.py
index e7c5f4049..0ddd2fd12 100644
--- a/doc/salome/examples/viewing_geom_objs_ex03.py
+++ b/doc/salome/examples/viewing_geom_objs_ex03.py
@@ -1,7 +1,7 @@
 # Changing Transparency
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/viewing_geom_objs_ex04.py b/doc/salome/examples/viewing_geom_objs_ex04.py
index c0d4f5f1f..85df3f099 100644
--- a/doc/salome/examples/viewing_geom_objs_ex04.py
+++ b/doc/salome/examples/viewing_geom_objs_ex04.py
@@ -2,7 +2,7 @@
 
 import os
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/whatis.py b/doc/salome/examples/whatis.py
index 9443f2a6c..1def67cdc 100644
--- a/doc/salome/examples/whatis.py
+++ b/doc/salome/examples/whatis.py
@@ -1,7 +1,7 @@
 # What Is
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/working_with_groups_ex01.py b/doc/salome/examples/working_with_groups_ex01.py
index c9b7e9b40..e349f6d8a 100644
--- a/doc/salome/examples/working_with_groups_ex01.py
+++ b/doc/salome/examples/working_with_groups_ex01.py
@@ -1,7 +1,7 @@
 # Creation of a group
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/working_with_groups_ex02.py b/doc/salome/examples/working_with_groups_ex02.py
index 1bf857fc9..39f6edc64 100644
--- a/doc/salome/examples/working_with_groups_ex02.py
+++ b/doc/salome/examples/working_with_groups_ex02.py
@@ -1,7 +1,7 @@
 # Adding an object to the group
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/working_with_groups_ex03.py b/doc/salome/examples/working_with_groups_ex03.py
index 1d3cf53eb..5c24d5e55 100644
--- a/doc/salome/examples/working_with_groups_ex03.py
+++ b/doc/salome/examples/working_with_groups_ex03.py
@@ -1,7 +1,7 @@
 # Removing an object from the group
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/working_with_groups_ex04.py b/doc/salome/examples/working_with_groups_ex04.py
index cdf1ac045..b0b623615 100644
--- a/doc/salome/examples/working_with_groups_ex04.py
+++ b/doc/salome/examples/working_with_groups_ex04.py
@@ -1,7 +1,7 @@
 # Union Groups
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/working_with_groups_ex05.py b/doc/salome/examples/working_with_groups_ex05.py
index 477cb19a9..3fea8c63e 100644
--- a/doc/salome/examples/working_with_groups_ex05.py
+++ b/doc/salome/examples/working_with_groups_ex05.py
@@ -1,7 +1,7 @@
 # Intersect Groups
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/doc/salome/examples/working_with_groups_ex06.py b/doc/salome/examples/working_with_groups_ex06.py
index 0a3f13f57..729c8f579 100644
--- a/doc/salome/examples/working_with_groups_ex06.py
+++ b/doc/salome/examples/working_with_groups_ex06.py
@@ -1,7 +1,7 @@
 # Cut Groups
 
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import GEOM
 from salome.geom import geomBuilder
 geompy = geomBuilder.New()
diff --git a/src/XAO/tests/CTestTestfileInstall.cmake b/src/XAO/tests/CTestTestfileInstall.cmake
index 7a56d543a..09e8b4d03 100644
--- a/src/XAO/tests/CTestTestfileInstall.cmake
+++ b/src/XAO/tests/CTestTestfileInstall.cmake
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_TEST(GEOM_TestXAO python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestXAO)
+ADD_TEST(GEOM_TestXAO python ${PYTHON_TEST_DRIVER} ${TIMEOUT} TestXAO)
 SET_TESTS_PROPERTIES(GEOM_TestXAO PROPERTIES
     LABELS "${COMPONENT_NAME}"
     ENVIRONMENT "XAO_DATA_DIR=$ENV{GEOM_ROOT_DIR}/bin/salome/test/xao/data")
-- 
2.30.2