From 8ccdedf3ec46cb51130af886be36b85b9e3015b7 Mon Sep 17 00:00:00 2001 From: Andrew Hoos Date: Wed, 30 Nov 2016 15:07:51 -0800 Subject: Update change with tests and fixes for tests --- coverage/execfile.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'coverage/execfile.py') diff --git a/coverage/execfile.py b/coverage/execfile.py index 4db737c..5633c59 100644 --- a/coverage/execfile.py +++ b/coverage/execfile.py @@ -194,14 +194,15 @@ def run_python_file(filename, args, package=None, modulename=None, path0=None): getattr(err, '__context__', None) # call a custom user excepthook if it is provided - if sys.excepthook is not sys.__excepthook__: - try: - sys.excepthook(typ, err, tb.tb_next) - except SystemExit: - raise - except: - typ, err, tb = sys.exc_info() - raise ExceptionDuringRun(typ, err, tb.tb_next) + try: + sys.excepthook(typ, err, tb.tb_next) + except SystemExit: + raise + except: + typ, err, tb = sys.exc_info() + raise ExceptionDuringRun(typ, err, tb.tb_next) + else: + sys.exit(1) finally: # Restore the old __main__, argv, and path. -- cgit v1.2.1