Avoid using import CORBA

Prefer: "from omniORB import CORBA"

diff --git a/bin/runConsole.py b/bin/runConsole.py
index fe62b6895225289254a9c5fb1e1dd7c95bdffefe..9639291f7f182d730a2e301f360dd7e40c74199d 100644 (file)
--- a/bin/runConsole.py
+++ b/bin/runConsole.py
@@ -131,7 +131,7 @@ def __get_running_session(requested_port=None, lastInstanceByDefault=False):
   return host, port, filename
 #
 
-import CORBA
+from omniORB import CORBA
 import CosNaming
 import orbmodule
 

diff --git a/src/Communication_SWIG/libSALOME_Comm.i b/src/Communication_SWIG/libSALOME_Comm.i
index 9a3c0211451220599801269c2656b515e22d5388..7681ec35fe9ac96c4086d12abb8435a3caeeb358 100644 (file)
--- a/src/Communication_SWIG/libSALOME_Comm.i
+++ b/src/Communication_SWIG/libSALOME_Comm.i
@@ -36,7 +36,7 @@
 {
   PyObject* pdict = PyDict_New();
   PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-  PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+  PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
  
   PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
@@ -66,7 +66,7 @@
 {
   PyObject* pdict = PyDict_New();
   PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-  PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+  PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
  
   PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
@@ -96,7 +96,7 @@
 {  
    PyObject* pdict = PyDict_New();
    PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-   PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+   PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
    PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
    PyObject* orb = PyDict_GetItemString(pdict, "o");
@@ -114,7 +114,7 @@
 {  
    PyObject* pdict = PyDict_New();
    PyDict_SetItemString(pdict, "__builtins__", PyEval_GetBuiltins());
-   PyRun_String("import CORBA", Py_single_input, pdict, pdict);
+   PyRun_String("from omniORB import CORBA", Py_single_input, pdict, pdict);
    PyRun_String("o = CORBA.ORB_init([''], CORBA.ORB_ID);", Py_single_input,
                    pdict, pdict);
    PyObject* orb = PyDict_GetItemString(pdict, "o");

diff --git a/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py b/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
index 878797b5b06a387ec47aeb27e96c98a59afdda19..b0800d53d335676ae4d644d1bc877e5239c00f94 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
+++ b/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
@@ -47,7 +47,7 @@ except :
     print 'lcc.FindOrLoad_Component("FactoryServer","SalomeTestComponent") failed'
 
 import sys
-import CORBA
+from omniORB import CORBA
 import CosNaming
 orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID)
 obj = orb.resolve_initial_references("NameService")