diff options
author | Andrew Hoos <andrewjhoos@gmail.com> | 2016-11-30 15:07:51 -0800 |
---|---|---|
committer | Andrew Hoos <andrewjhoos@gmail.com> | 2016-11-30 15:07:51 -0800 |
commit | f807c4271e59a8016f15c8ba4763b0c2d92645a9 (patch) | |
tree | 47887b5f04bf49c2d051007f20d162088809d7d9 /coverage/execfile.py | |
parent | e3bbbfdc30432af2a58e6e8b3f503d213d77c60b (diff) | |
download | python-coveragepy-git-f807c4271e59a8016f15c8ba4763b0c2d92645a9.tar.gz |
Update change with tests and fixes for tests
Diffstat (limited to 'coverage/execfile.py')
-rw-r--r-- | coverage/execfile.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/coverage/execfile.py b/coverage/execfile.py index 4db737c5..5633c59e 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. |