From be9682a29632257842384b0cecca6b9b6475216c Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 20 Oct 2013 08:23:52 -0400 Subject: Except clause can now use 'as', no need for lots of sys.exc_info --- coverage/cmdline.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'coverage/cmdline.py') diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 9ff29f3..9373283 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -716,21 +716,18 @@ def main(argv=None): argv = sys.argv[1:] try: status = CoverageScript().command_line(argv) - except ExceptionDuringRun: + except ExceptionDuringRun as err: # An exception was caught while running the product code. The # sys.exc_info() return tuple is packed into an ExceptionDuringRun # exception. - _, err, _ = sys.exc_info() traceback.print_exception(*err.args) status = ERR - except CoverageException: + except CoverageException as err: # A controlled error inside coverage.py: print the message to the user. - _, err, _ = sys.exc_info() print(err) status = ERR - except SystemExit: + except SystemExit as err: # The user called `sys.exit()`. Exit with their argument, if any. - _, err, _ = sys.exc_info() if err.args: status = err.args[0] else: -- cgit v1.2.1