#18196: merge with 3.3

This commit is contained in:
Roger Serwy 2013-06-11 22:25:34 -05:00
commit 6d844c5db9
2 changed files with 6 additions and 0 deletions

View File

@ -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:

View File

@ -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".