SWIG: improve precedence mechanism: isinstance(obj, MEDCoupling.obj_class) and

isinstance(obj, MEDLoader.obj_class) both return true.

diff --git a/src/MEDCoupling_Swig/MEDCoupling.i b/src/MEDCoupling_Swig/MEDCoupling.i
index a7080a02a30a656b2452aafb0e4e5554c0c0b71c..e9176473f8030b228183d6a65a3aa9cba1eb1eb5 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCoupling.i
+++ b/src/MEDCoupling_Swig/MEDCoupling.i
@@ -98,3 +98,16 @@ def ParaMEDMEMDataArrayIntTupleImod(self,*args):
 %}
 
 %include "MEDCouplingFinalize.i"
+
+%pythoncode %{
+
+# Give precedence to MEDCoupling namespace:
+import sys
+# If MEDLoader was already loaded override its namespace with the one from MEDCoupling:
+if sys.modules.has_key('MEDLoader'):
+  ml_mod = sys.modules['MEDLoader']  
+  for k, v in sys.modules['MEDCoupling'].__dict__.items():
+    if (k.startswith("MED") or k.startswith("InterpKernel")) and type(v) is type(type):
+      exec("ml_mod.__dict__[k] = %s" % k) 
+
+%}

diff --git a/src/MEDCoupling_Swig/MEDCouplingFinalize.i b/src/MEDCoupling_Swig/MEDCouplingFinalize.i
index e54cc904d0e0b9f2d81b12d3551b9efae52cb4c4..194cc4c70f2b54f9fc9fa4d0ee870c37e0ff6e41 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingFinalize.i
+++ b/src/MEDCoupling_Swig/MEDCouplingFinalize.i
@@ -71,4 +71,5 @@ del ParaMEDMEMDataArrayIntTupleIsub
 del ParaMEDMEMDataArrayIntTupleImul
 del ParaMEDMEMDataArrayIntTupleIdiv
 del ParaMEDMEMDataArrayIntTupleImod
+
 %}

diff --git a/src/MEDLoader/Swig/MEDLoader.i b/src/MEDLoader/Swig/MEDLoader.i
index 24aa397366f3f3b883f3bd22f3feba6955c31f9d..5d4126234c8d063fbfcbc0fd26c87df8fc1fb141 100644 (file)
--- a/src/MEDLoader/Swig/MEDLoader.i
+++ b/src/MEDLoader/Swig/MEDLoader.i
@@ -99,3 +99,16 @@ def ParaMEDMEMDataArrayIntTupleImod(self,*args):
 %}
 
 %include "MEDCouplingFinalize.i"
+
+%pythoncode %{
+
+# Give precedence to MEDCoupling namespace:
+import sys
+# If MEDLoader was already loaded override its namespace with the one from MEDCoupling:
+if sys.modules.has_key('MEDCoupling'):
+  mc_mod = sys.modules['MEDCoupling']  
+  for k, v in mc_mod.__dict__.items():
+    if (k.startswith("MED") or k.startswith("InterpKernel")) and type(v) is type(type):
+      exec("%s = v" % k) 
+
+%}