From 64151a2c3ec28c7f1822d854acfda253fa01c3cb Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 14 Oct 2012 20:07:54 -0500 Subject: [PATCH] reverted custom_install tests --- VERSION | 2 +- gluon/custom_import.py | 30 +++++++++++------------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index 80582709..49db9ebe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.1.0 (2012-10-14 18:29:10) dev +Version 2.1.0 (2012-10-14 20:07:50) dev diff --git a/gluon/custom_import.py b/gluon/custom_import.py index b924ae83..4ab746d8 100644 --- a/gluon/custom_import.py +++ b/gluon/custom_import.py @@ -13,7 +13,7 @@ NATIVE_IMPORTER = __builtin__.__import__ TRACK_CHANGES = False INVALID_MODULES = set(sys.modules.keys()).union(('','gluon','applications','custom_import')) -# backward compatibility API +# backward compatibility API def custom_import_install(): __builtin__.__import__ = custom_importer @@ -22,17 +22,14 @@ def track_changes(track=True): global TRACK_CHANGES TRACK_CHANGES = track -def is_tracking_changes(): +def is_tracking_changes(): return TRACK_CHANGES -class CustomImportException(ImportError): - pass - def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1): """ The web2py custom importer. Like the standard Python importer but it tries to transform import statements as something like - "import applications.app_name.modules.x". + "import applications.app_name.modules.x". If the import failed, fall back on naive_importer """ @@ -46,8 +43,7 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1): if hasattr(current,'request') \ and level<=0 \ and not name.split('.')[0] in INVALID_MODULES \ - and isinstance(globals, dict): - import_tb = None + and isinstance(globals, dict): try: items = current.request.folder.split(os.path.sep) if not items[-1]: items = items[:-1] @@ -56,26 +52,22 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1): # import like "import x" or "import x.y" result = None for itemname in name.split("."): + new_mod = base_importer( + modules_prefix, globals,locals, [itemname], level) + try: + result = result or new_mod.__dict__[itemname] + except KeyError, e: + raise ImportError, 'Cannot import module %s' % str(e) modules_prefix += "." + itemname - base_importer( - modules_prefix, globals,locals, [], level) return result else: # import like "from x import a, b, ..." pname = modules_prefix + "." + name return base_importer(pname, globals, locals, fromlist, level) except ImportError, e1: - import_tb = sys.exc_info()[2] - try: - return NATIVE_IMPORTER(name,globals,locals,fromlist,level) - except ImportError, e3: - raise ImportError, e1, import_tb.tb_next # there an import error in the module + pass # the module does not exist except Exception, e2: raise e2 # there is an error in the module - finally: - if import_tb: - import_tb = None - return NATIVE_IMPORTER(name,globals,locals,fromlist,level)