summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-06-12 03:25:14 (GMT)
committerRoger Serwy <roger.serwy@gmail.com>2013-06-12 03:25:14 (GMT)
commitf4675219273d902de8d20280746a8ada6c8aa4b8 (patch)
tree3cea55520ce5fc569b6cde06feebbbd59d19b6c7
parent036e84924a0e0bdcc3c17033ea0263a3462825e1 (diff)
downloadcpython-f4675219273d902de8d20280746a8ada6c8aa4b8.zip
cpython-f4675219273d902de8d20280746a8ada6c8aa4b8.tar.gz
cpython-f4675219273d902de8d20280746a8ada6c8aa4b8.tar.bz2
#18196: Avoid displaying spurious SystemExit tracebacks.
-rw-r--r--Lib/idlelib/run.py4
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 88da23b..f5d260d 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:
diff --git a/Misc/NEWS b/Misc/NEWS
index cd76c4c..f3f2a1e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,8 @@ Library
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".