summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2010-05-11 12:31:21 +0000
committerMarko Kreen2010-06-09 14:51:00 +0000
commit0b324ec67c6c79a20137cec637f1ed271ac2d0a0 (patch)
tree617e84a1dee5da8a59c01d0a5d95a0d9fb08a1e9
parentd0a79dbf3615142f1ab313c2ea3c331bc155e6c8 (diff)
pkgloader: avoid supressing any import errors
-rw-r--r--python/pkgloader.py31
1 files changed, 14 insertions, 17 deletions
diff --git a/python/pkgloader.py b/python/pkgloader.py
index f27b3571..5da2ad86 100644
--- a/python/pkgloader.py
+++ b/python/pkgloader.py
@@ -63,24 +63,21 @@ def require(pkg, reqver):
_install_path(pkg, os.path.join(_top, pkgdir))
break
- # now import whatever is available
inst_ver = reqval
- try:
- mod = __import__(pkg)
- ver_str = mod.__version__
- # check if it is actually useful
- ver_str = ver_str.split('-', 1)[0]
- full_ver = tuple([int(x) for x in ver_str.split('.')])
- if full_ver[0] != reqval[0] or reqval > full_ver:
- raise ImportError("Request for Skytools ver '%s', got '%s'" % (
- reqver, '.'.join(full_ver)))
- raise ImportError("Request for package '%s' ver '%s', have '%s'" % (
- pkg, reqver, '.'.join(full_ver)))
- inst_ver = full_ver
- except ImportError:
- pass
- except AttributeError:
- pass
+
+ # now import whatever is available
+ mod = __import__(pkg)
+
+ # check if it is actually useful
+ ver_str = mod.__version__
+ ver_str = ver_str.split('-', 1)[0]
+ full_ver = tuple([int(x) for x in ver_str.split('.')])
+ if full_ver[0] != reqval[0] or reqval > full_ver:
+ raise ImportError("Request for Skytools ver '%s', got '%s'" % (
+ reqver, '.'.join(full_ver)))
+ raise ImportError("Request for package '%s' ver '%s', have '%s'" % (
+ pkg, reqver, '.'.join(full_ver)))
+ inst_ver = full_ver
# remember full version
_import_cache[pkg] = inst_ver