diff options
author | Terry Jan Reedy <tjreedy@udel.edu> | 2017-01-05 04:18:01 (GMT) |
---|---|---|
committer | Terry Jan Reedy <tjreedy@udel.edu> | 2017-01-05 04:18:01 (GMT) |
commit | 85c1c9417831713bb286b491d5357b193fb6d732 (patch) | |
tree | 7c3bf57bf8731dae9da0c42ba1a7c231a87353c8 | |
parent | 9971220e415ceafb82c915b6dc73fbd70842bbb7 (diff) | |
parent | e16265d36797d2929e653a7d49b1a53accdbec59 (diff) | |
download | cpython-85c1c9417831713bb286b491d5357b193fb6d732.zip cpython-85c1c9417831713bb286b491d5357b193fb6d732.tar.gz cpython-85c1c9417831713bb286b491d5357b193fb6d732.tar.bz2 |
Merge with 3.6
-rwxr-xr-x | Lib/idlelib/pyshell.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py index e1eade1..f3ee391 100755 --- a/Lib/idlelib/pyshell.py +++ b/Lib/idlelib/pyshell.py @@ -5,15 +5,15 @@ try: except ImportError: print("** IDLE can't import Tkinter.\n" "Your Python may not be configured for Tk. **", file=sys.__stderr__) - sys.exit(1) + raise SystemExit(1) import tkinter.messagebox as tkMessageBox if TkVersion < 8.5: root = Tk() # otherwise create root in main root.withdraw() tkMessageBox.showerror("Idle Cannot Start", - "Idle requires tcl/tk 8.5+, not $s." % TkVersion, + "Idle requires tcl/tk 8.5+, not %s." % TkVersion, parent=root) - sys.exit(1) + raise SystemExit(1) from code import InteractiveInterpreter import getopt |