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

[terry.reedy]

https://hg.python.org/cpython/rev/3bcb184b62f8
changeset:   97227:3bcb184b62f8
parent:      97220:5a13a3f3bb3b
parent:      97226:863e3cdbbabe
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Mon Aug 03 18:35:09 2015 -0400
summary:
  Issue #24759: Merge with 3.5

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


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -23,16 +23,6 @@
           "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