improved import, thanks Michele
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.00.0 (2012-06-06 11:37:26) dev
|
Version 2.00.0 (2012-06-06 20:30:33) dev
|
||||||
|
|||||||
@@ -287,14 +287,14 @@ class _Web2pyImporter(_BaseImporter):
|
|||||||
return super(_Web2pyImporter, self) \
|
return super(_Web2pyImporter, self) \
|
||||||
.__call__(modules_prefix+"."+name,
|
.__call__(modules_prefix+"."+name,
|
||||||
globals, locals, fromlist, level)
|
globals, locals, fromlist, level)
|
||||||
except ImportError:
|
except ImportError, e:
|
||||||
pass
|
try:
|
||||||
|
return super(_Web2pyImporter, self).__call__(name, globals, locals,
|
||||||
|
fromlist, level)
|
||||||
|
except ImportError, e1:
|
||||||
|
raise e
|
||||||
return super(_Web2pyImporter, self).__call__(name, globals, locals,
|
return super(_Web2pyImporter, self).__call__(name, globals, locals,
|
||||||
fromlist, level)
|
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,
|
def __import__dot(self, prefix, name, globals, locals, fromlist,
|
||||||
level):
|
level):
|
||||||
@@ -312,8 +312,8 @@ class _Web2pyImporter(_BaseImporter):
|
|||||||
locals, [name], level)
|
locals, [name], level)
|
||||||
try:
|
try:
|
||||||
result = result or new_mod.__dict__[name]
|
result = result or new_mod.__dict__[name]
|
||||||
except KeyError:
|
except KeyError, e:
|
||||||
raise ImportError()
|
raise ImportError, 'Cannot import module %s' % str(e)
|
||||||
prefix += "." + name
|
prefix += "." + name
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user