Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions...
authordavid-sarah <david-sarah@jacaranda.org>
Mon, 11 Apr 2011 19:07:38 +0000 (12:07 -0700)
committerdavid-sarah <david-sarah@jacaranda.org>
Mon, 11 Apr 2011 19:07:38 +0000 (12:07 -0700)
src/allmydata/__init__.py

index 77973ab833b3a7640e6f5869405cdd5f0c27d135..6bb20d81a169a16824d29f0afcdbeace4e35c512 100644 (file)
@@ -188,7 +188,7 @@ def get_package_versions_and_locations():
                 module = sys.modules[modulename]
             except ImportError:
                 etype, emsg, etrace = sys.exc_info()
-                trace_info = (emsg, ([None] + traceback.extract_tb(etrace))[-1])
+                trace_info = (etype, str(emsg), ([None] + traceback.extract_tb(etrace))[-1])
                 packages.append( (pkgname, (None, None, trace_info)) )
             else:
                 if 'sqlite' in pkgname:
@@ -220,7 +220,7 @@ def check_requirement(req, vers_and_locs):
         return
     (actual, location, comment) = vers_and_locs[name]
     if actual is None:
-        # comment is (message, (filename, line number, function name, text)) for the original ImportError
+        # comment is (type, message, (filename, line number, function name, text)) for the original ImportError
         raise ImportError("for requirement %r: %s" % (req, comment))
     if actual == 'unknown':
         return