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

pyutil: assertutil: simplify handling of exception during formatting of precondition message, and reduce dependency to just the Python Standard Library's logging module

Browse Source
This commit is contained in:
Zooko O'Whielacronx 2008-12-10 07:10:57 -07:00
parent 1d84606d52
commit e29e4c04d9
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/util/assertutil.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2003-2006 Bryce "Zooko" Wilcox-O'Hearn
# Copyright (c) 2003-2008 Zooko Wilcox-O'Hearn
# mailto:zooko@zooko.com
# http://zooko.com/
# Permission is hereby granted, free of charge, to any person obtaining a
@ -11,8 +11,6 @@ Tests useful in assertion checking, prints out nicely formated messages too.
from humanreadable import hr
from allmydata.util import log
def _assert(___cond=False, *___args, **___kwargs):
if ___cond:
return True
@ -47,13 +45,9 @@ def precondition(___cond=False, *___args, **___kwargs):
if ___kwargs:
msgbuf.append("%s: %s %s" % ((___kwargs.items()[0][0],) + tuple(map(hr, (___kwargs.items()[0][1], type(___kwargs.items()[0][1]),)))))
msgbuf.extend([", %s: %s %s" % tuple(map(hr, (k, v, type(v),))) for k, v in ___kwargs.items()[1:]])
except Exception, le:
log.msg("assertutil.precondition(): INTERNAL ERROR IN allmydata.util.assertutil. %s %s %s" % (type(le), repr(le), le.args,))
log.err()
raise le
except:
log.msg("assertutil.precondition(): INTERNAL ERROR IN allmydata.util.assertutil.")
log.err()
import logging
logging.exception("assertutil.precondition(): INTERNAL ERROR in allmydata.util.assertutil.")
raise
raise AssertionError, "".join(msgbuf)