summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-06-12 03:25:34 (GMT)
committerRoger Serwy <roger.serwy@gmail.com>2013-06-12 03:25:34 (GMT)
commit6d844c5db9b826900a3cd3ea3d8ab5338df35da9 (patch)
tree4aaa9619bdaac6c79d829d282791dd69112e473a /Lib
parentc2efeb61b9b11137654810067b8beca393e6ff08 (diff)
parentf4675219273d902de8d20280746a8ada6c8aa4b8 (diff)
downloadcpython-6d844c5db9b826900a3cd3ea3d8ab5338df35da9.zip
cpython-6d844c5db9b826900a3cd3ea3d8ab5338df35da9.tar.gz
cpython-6d844c5db9b826900a3cd3ea3d8ab5338df35da9.tar.bz2
#18196: merge with 3.3
Diffstat (limited to 'Lib')
-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 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: