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

Reverted to the import using fromlist, but with working traceback.

Browse Source
This commit is contained in:
Michele Comitini
2012-10-15 11:20:04 +02:00
parent 3c0b58322a
commit 484f53224d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/custom_import.py
+8 -3
View File
@@ -56,9 +56,14 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
# import like "import x" or "import x.y" # import like "import x" or "import x.y"
result = None result = None
for itemname in name.split("."): for itemname in name.split("."):
new_mod = base_importer(
modules_prefix, globals,locals, [itemname], level)
try:
result = result or new_mod.__dict__[itemname]
print result
except KeyError, e:
raise ImportError, 'Cannot import module %s' % str(e)
modules_prefix += "." + itemname modules_prefix += "." + itemname
base_importer(
modules_prefix, globals,locals, [], level)
return result return result
else: else:
# import like "from x import a, b, ..." # import like "from x import a, b, ..."
@@ -69,7 +74,7 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
try: try:
return NATIVE_IMPORTER(name,globals,locals,fromlist,level) return NATIVE_IMPORTER(name,globals,locals,fromlist,level)
except ImportError, e3: except ImportError, e3:
raise ImportError, e1, import_tb.tb_next # there an import error in the module raise ImportError, e1, import_tb # there an import error in the module
except Exception, e2: except Exception, e2:
raise e2 # there is an error in the module raise e2 # there is an error in the module
finally: finally: