diff options
author | Raymond Hettinger <python@rcn.com> | 2013-02-09 14:20:55 -0500 |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2013-02-09 14:20:55 -0500 |
commit | 4234992c750cad2bbf36f712a47515f050df549f (patch) | |
tree | b869d53d5997c63fa66c1d4624a89cb421a760d3 | |
parent | a5e7f8f8e043ff22889ad39c62130966706e36cb (diff) | |
download | cpython-git-4234992c750cad2bbf36f712a47515f050df549f.tar.gz |
Keep IDLE from displaying spurious SystemExit tracebacks
when running scripts that terminated by raising SystemExit
(i.e. unittest and turtledemo).
-rw-r--r-- | Lib/idlelib/run.py | 5 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index acae3aea7a..e82ebf4c92 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -301,11 +301,14 @@ class Executive(object): exec code in self.locals finally: interruptable = False + except SystemExit: + # Scripts that raise SystemExit should just + # return to the interactive prompt + pass except: self.usr_exc_info = sys.exc_info() if quitting: exit() - # even print a user code SystemExit exception, continue print_exception() jit = self.rpchandler.console.getvar("<<toggle-jit-stack-viewer>>") if jit: @@ -205,6 +205,9 @@ Library - Issue #7358: cStringIO.StringIO now supports writing to and reading from a stream larger than 2 GiB on 64-bit systems. +- IDLE was displaying spurious SystemExit tracebacks when running scripts + that terminated by raising SystemExit (i.e. unittest and turtledemo). + - Issue #10355: In SpooledTemporaryFile class mode and name properties and xreadlines method now work for unrolled files. encoding and newlines properties now removed as they have no sense and always produced |