Merge pull request #554 from kjkuan/fix-circular-imports-take-2

Make web2py's custom_import work with circular imports.
2014-12-12 05:21:13 -06:00
parent de55a729dc a01dbbab49
commit 5ea654ed06
1 changed files with 1 additions and 1 deletions
@@ -81,7 +81,7 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
                        new_mod = base_importer(
                            modules_prefix, globals, locals, [itemname], level)
                        try:
-                            result = result or new_mod.__dict__[itemname]
+                            result = result or sys.modules[modules_prefix+'.'+itemname]
                        except KeyError, e:
                            raise ImportError, 'Cannot import module %s' % str(e)
                        modules_prefix += "." + itemname