dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Make web2py's custom_import work with circular imports.
This commit is contained in:
mdipierro
2014-12-12 05:21:13 -06:00
parent de55a729dc a01dbbab49
commit 5ea654ed06
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/custom_import.py
+1 -1
View File
@@ -81,7 +81,7 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
new_mod = base_importer( new_mod = base_importer(
modules_prefix, globals, locals, [itemname], level) modules_prefix, globals, locals, [itemname], level)
try: try:
result = result or new_mod.__dict__[itemname] result = result or sys.modules[modules_prefix+'.'+itemname]
except KeyError, e: except KeyError, e:
raise ImportError, 'Cannot import module %s' % str(e) raise ImportError, 'Cannot import module %s' % str(e)
modules_prefix += "." + itemname modules_prefix += "." + itemname