Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#18196: merge with 3.3

This commit is contained in:
Roger Serwy 2013-06-11 22:25:34 -05:00
parent c2efeb61b9 f467521927
commit 6d844c5db9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/idlelib/run.py
View File

@ -339,6 +339,10 @@ class Executive(object):
exec(code, self.locals) exec(code, self.locals)
finally: finally:
interruptable = False interruptable = False
except SystemExit:
# Scripts that raise SystemExit should just
# return to the interactive prompt
pass
except: except:
self.usr_exc_info = sys.exc_info() self.usr_exc_info = sys.exc_info()
if quitting: if quitting:

2
Misc/NEWS
View File

@ -455,6 +455,8 @@ C-API
IDLE IDLE
---- ----
- Issue #18196: Avoid displaying spurious SystemExit tracebacks.
- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition. - Issue #5492: Avoid traceback when exiting IDLE caused by a race condition.
- Issue #17511: Keep IDLE find dialog open after clicking "Find Next". - Issue #17511: Keep IDLE find dialog open after clicking "Find Next".