Commit dd7b6965 authored by Nicolas Delaby's avatar Nicolas Delaby

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.
parent f826e1bc
...@@ -360,7 +360,10 @@ class Unmarshaller(ElementTreeContentHandler): ...@@ -360,7 +360,10 @@ class Unmarshaller(ElementTreeContentHandler):
# find_class() is copied from pickle.py # find_class() is copied from pickle.py
def find_class(self, module, name): 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) return getattr(module, name)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment