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

[terry.reedy]

https://hg.python.org/cpython/rev/3358b5d32910
changeset:   97162:3358b5d32910
parent:      97158:ad4c1bfe257f
parent:      97161:3006f1e6a276
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Thu Jul 30 21:16:44 2015 -0400
summary:
  Merge with 3.5

files:
  Lib/idlelib/PyShell.py |  10 ++++++++++
  1 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -23,6 +23,16 @@
           "Your Python may not be configured for Tk. **", file=sys.__stderr__)
     sys.exit(1)
 import tkinter.messagebox as tkMessageBox
+try:
+    from tkinter import ttk
+except:
+    root = Tk()
+    root.withdraw()
+    tkMessageBox.showerror("Idle Cannot Start",
+            "Idle now requires the tkinter.ttk module from tcl/tk 8.5+.\n"
+            + "It found tk %s and no ttk." % TkVersion,
+            parent=root)
+    sys.exit(1)
 
 from idlelib.EditorWindow import EditorWindow, fixwordbreaks
 from idlelib.FileList import FileList

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