diff options
| author | Roger Serwy <roger.serwy@gmail.com> | 2013-06-12 03:25:34 (GMT) |
|---|---|---|
| committer | Roger Serwy <roger.serwy@gmail.com> | 2013-06-12 03:25:34 (GMT) |
| commit | 6d844c5db9b826900a3cd3ea3d8ab5338df35da9 (patch) | |
| tree | 4aaa9619bdaac6c79d829d282791dd69112e473a | |
| parent | c2efeb61b9b11137654810067b8beca393e6ff08 (diff) | |
| parent | f4675219273d902de8d20280746a8ada6c8aa4b8 (diff) | |
| download | cpython-6d844c5db9b826900a3cd3ea3d8ab5338df35da9.zip cpython-6d844c5db9b826900a3cd3ea3d8ab5338df35da9.tar.gz cpython-6d844c5db9b826900a3cd3ea3d8ab5338df35da9.tar.bz2 | |
#18196: merge with 3.3
| -rw-r--r-- | Lib/idlelib/run.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 5283a93..15f4472 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -339,6 +339,10 @@ class Executive(object): exec(code, 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: @@ -455,6 +455,8 @@ C-API IDLE ---- +- Issue #18196: Avoid displaying spurious SystemExit tracebacks. + - Issue #5492: Avoid traceback when exiting IDLE caused by a race condition. - Issue #17511: Keep IDLE find dialog open after clicking "Find Next". |