improved import, thanks Michele

This commit is contained in:
Massimo DiPierro
2012-06-06 20:30:37 -05:00
parent 3f58332dc0
commit b94d758bf1
2 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-06-06 11:37:26) dev
Version 2.00.0 (2012-06-06 20:30:33) dev
+8 -8
View File
@@ -287,14 +287,14 @@ class _Web2pyImporter(_BaseImporter):
return super(_Web2pyImporter, self) \
.__call__(modules_prefix+"."+name,
globals, locals, fromlist, level)
except ImportError:
pass
except ImportError, e:
try:
return super(_Web2pyImporter, self).__call__(name, globals, locals,
fromlist, level)
except ImportError, e1:
raise e
return super(_Web2pyImporter, self).__call__(name, globals, locals,
fromlist, level)
#except Exception, e:
# raise e # Don't hide something that went wrong
#finally:
self.end()
def __import__dot(self, prefix, name, globals, locals, fromlist,
level):
@@ -312,8 +312,8 @@ class _Web2pyImporter(_BaseImporter):
locals, [name], level)
try:
result = result or new_mod.__dict__[name]
except KeyError:
raise ImportError()
except KeyError, e:
raise ImportError, 'Cannot import module %s' % str(e)
prefix += "." + name
return result