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

catching errors in python3 in custom_import

Browse Source
This commit is contained in:
mdipierro
2017-04-28 08:01:20 -05:00
parent ad43249f61
commit 9ab7ed0029
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/custom_import.py
+2 -2
View File
@@ -75,7 +75,7 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
try: try:
oname = name if not name.startswith('.') else '.'+name oname = name if not name.startswith('.') else '.'+name
return NATIVE_IMPORTER(oname, globals, locals, fromlist, level) return NATIVE_IMPORTER(oname, globals, locals, fromlist, level)
except ImportError: except (ImportError, KeyError):
items = current.request.folder.split(os.path.sep) items = current.request.folder.split(os.path.sep)
if not items[-1]: if not items[-1]:
items = items[:-1] items = items[:-1]
@@ -100,7 +100,7 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
import_tb = sys.exc_info()[2] import_tb = sys.exc_info()[2]
try: try:
return NATIVE_IMPORTER(name, globals, locals, fromlist, level) return NATIVE_IMPORTER(name, globals, locals, fromlist, level)
except ImportError as e3: except (ImportError, KeyError) as e3:
raise ImportError(e1, import_tb) # there an import error in the module raise ImportError(e1, import_tb) # there an import error in the module
except Exception as e2: except Exception as e2:
raise # there is an error in the module raise # there is an error in the module