[Python-checkins] cpython (merge 3.6 -> default): Merge with 3.6

[terry.reedy]

https://hg.python.org/cpython/rev/6217da1e3879
changeset:   106002:6217da1e3879
parent:      106000:af363b5200ff
parent:      106001:52d671684342
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Wed Jan 04 23:18:01 2017 -0500
summary:
  Merge with 3.6

files:
  Lib/idlelib/pyshell.py |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -5,15 +5,15 @@
 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

-- 
Repository URL: https://hg.python.org/cpython