summaryrefslogtreecommitdiff
path: root/coverage/execfile.py
diff options
context:
space:
mode:
authorAndrew Hoos <andrewjhoos@gmail.com>2016-11-30 15:07:51 -0800
committerAndrew Hoos <andrewjhoos@gmail.com>2016-11-30 15:07:51 -0800
commit8ccdedf3ec46cb51130af886be36b85b9e3015b7 (patch)
treeb2966d8733706c8db8203199cff0ce00f7afe9ad /coverage/execfile.py
parentd1da15f12e248954adc1d6bf222304ba1e16f9d9 (diff)
downloadpython-coveragepy-8ccdedf3ec46cb51130af886be36b85b9e3015b7.tar.gz
Update change with tests and fixes for tests
Diffstat (limited to 'coverage/execfile.py')
-rw-r--r--coverage/execfile.py17
1 files changed, 9 insertions, 8 deletions
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.