[Erp5-report] r39634 nicolas - /erp5/trunk/utils/xml_marshaller/src/xml_marshaller/

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Oct 28 18:34:26 2010
New Revision: 39634

URL: http://svn.erp5.org?rev=39634&view=rev
Log:
There is a conflict with 'xml_marshaller' name.
it can be both the module or relative module.
This is a patch to workaround this issue.

Modified:
    erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py

Modified: erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py
URL: http://svn.erp5.org/erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py?rev=39634&r1=39633&r2=39634&view=diff
==============================================================================
--- erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py [utf8] (original)
+++ erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py [utf8] Thu Oct 28 18:34:26 2010
@@ -360,7 +360,10 @@ class Unmarshaller(ElementTreeContentHan
 
   # find_class() is copied from pickle.py
   def find_class(self, module, name):
-    module = __import__(module, globals(), locals(), [''])
+    try:
+      module = __import__(module, globals(), locals(), [''])
+    except ImportError:
+      module = __import__(module, {}, locals(), [''])
     return getattr(module, name)