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

fix local import for contrib modules

Browse Source
This commit is contained in:
ilvalle
2016-07-15 20:34:27 +02:00
parent d9c2f778ee
commit f9927f4f3d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/custom_import.py
+3 -3
View File
@@ -62,6 +62,9 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
except: # there is no current.request (should never happen) except: # there is no current.request (should never happen)
base_importer = NATIVE_IMPORTER base_importer = NATIVE_IMPORTER
if not(PY2) and level < 0:
level = 0
# if not relative and not from applications: # if not relative and not from applications:
if hasattr(current, 'request') \ if hasattr(current, 'request') \
and level <= 0 \ and level <= 0 \
@@ -104,9 +107,6 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1):
finally: finally:
if import_tb: if import_tb:
import_tb = None import_tb = None
elif not(PY2) and level < 0:
# FIXME PY3 why level is < 0?
level = 0
return NATIVE_IMPORTER(name, globals, locals, fromlist, level) return NATIVE_IMPORTER(name, globals, locals, fromlist, level)