SWIG: give precedence to MEDCoupling namespace when both MEDLoader and

MEDCoupling were loaded. All returned objects are now always from MEDCoupling.

diff --git a/src/MEDLoader/Swig/MEDLoaderCommon.i b/src/MEDLoader/Swig/MEDLoaderCommon.i
index 63acae414dcfeca2b6017eaa6c84bfbf6a05833c..99c52a16cf80216c5dab79717f41e5fa1370391f 100644 (file)
--- a/src/MEDLoader/Swig/MEDLoaderCommon.i
+++ b/src/MEDLoader/Swig/MEDLoaderCommon.i
@@ -23,6 +23,18 @@
 #define MEDCOUPLING_EXPORT
 #define MEDLOADER_EXPORT
 
+// Little trick to give precedence to MEDCoupling namespace if
+// both modules MEDLoader and MEDCoupling were loaded. Basically we cancel out SWIG type
+// registration during the loading of MEDLoader if MEDCoupling is already there.
+%pythoncode %{
+import sys
+if sys.modules.has_key('MEDCoupling'):
+  mc_mod = sys.modules['MEDCoupling']
+  for k, v in mc_mod.__dict__.items():
+    if k.startswith("MED") and type(v) is type(type):
+      exec("_MEDLoader.%s_swigregister = lambda x: None" % k)
+%}
+
 %include "MEDCouplingCommon.i"
 
 %{