summaryrefslogtreecommitdiff
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-06-11 22:25:34 -0500
committerRoger Serwy <roger.serwy@gmail.com>2013-06-11 22:25:34 -0500
commit0349271aff37b4451b5bb3308b3cac732c5c37e9 (patch)
treea77027c3dd0324b1073728456538b48cfc1afbbb /Lib/idlelib
parentc96b89696b7cb96354591c1e58460aab11b8484c (diff)
parenta94b6950d2dcfc8e55a1edc95e855c6e1d879d64 (diff)
downloadcpython-0349271aff37b4451b5bb3308b3cac732c5c37e9.tar.gz
#18196: merge with 3.3
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/run.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 5283a93b80..15f44720dd 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: