ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-06 09:31:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389

Browse Source
This commit is contained in:
david-sarah 2011-04-11 12:07:38 -07:00
parent a09d7300e0
commit fffb3ae75b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/__init__.py
View File

@ -188,7 +188,7 @@ def get_package_versions_and_locations():
module = sys.modules[modulename] module = sys.modules[modulename]
except ImportError: except ImportError:
etype, emsg, etrace = sys.exc_info() 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)) ) packages.append( (pkgname, (None, None, trace_info)) )
else: else:
if 'sqlite' in pkgname: if 'sqlite' in pkgname:
@ -220,7 +220,7 @@ def check_requirement(req, vers_and_locs):
return return
(actual, location, comment) = vers_and_locs[name] (actual, location, comment) = vers_and_locs[name]
if actual is None: 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)) raise ImportError("for requirement %r: %s" % (req, comment))
if actual == 'unknown': if actual == 'unknown':
return return