diff options
| author | Michael E Brown <mebrown@michaels-house.net> | 2007-10-31 03:06:55 -0500 |
|---|---|---|
| committer | Michael E Brown <mebrown@michaels-house.net> | 2007-10-31 03:06:55 -0500 |
| commit | b2303e57b18ab9fcad7442508dc20f62a23e306e (patch) | |
| tree | 71731926bb81c992e6ca90d2d1ebbeab64416198 | |
| parent | c3a61e9515caa9736f3c95c85704127223c02e37 (diff) | |
| download | mock-b2303e57b18ab9fcad7442508dc20f62a23e306e.tar.gz mock-b2303e57b18ab9fcad7442508dc20f62a23e306e.tar.xz mock-b2303e57b18ab9fcad7442508dc20f62a23e306e.zip | |
consolidate redundant code.
| -rwxr-xr-x | src/py-libs/trace_decorator.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/py-libs/trace_decorator.py b/src/py-libs/trace_decorator.py index 391f346..bb95148 100755 --- a/src/py-libs/trace_decorator.py +++ b/src/py-libs/trace_decorator.py @@ -3,7 +3,6 @@ # Written by Michael Brown # Copyright (C) 2007 Michael E Brown <mebrown@michaels-house.net> -import types from decorator import decorator import logging @@ -23,11 +22,7 @@ def traceLog(logger = moduleLog): result = "Bad exception raised: Exception was not a derived class of 'Exception'" try: result = f(*args, **kw) - except KeyboardInterrupt, e: - result = "EXCEPTION RAISED" - l2.debug( "EXCEPTION: %s\n" % e, exc_info=1) - raise - except Exception, e: + except (KeyboardInterrupt, Exception), e: result = "EXCEPTION RAISED" l2.debug( "EXCEPTION: %s\n" % e, exc_info=1) raise |