changeset:   97226:863e3cdbbabe
branch:      3.5
parent:      97219:0f2fc3e7816d
parent:      97225:06852194f541
user:        Terry Jan Reedy <tjreedy@udel.edu>
date:        Mon Aug 03 18:34:45 2015 -0400
description:
Issue #24759: Merge with 3.4


diff -r 0f2fc3e7816d -r 863e3cdbbabe Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py	Mon Aug 03 14:55:58 2015 -0400
+++ b/Lib/idlelib/PyShell.py	Mon Aug 03 18:34:45 2015 -0400
@@ -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