[Python-checkins] cpython (merge 3.4 -> 3.4): Merge

Tue Aug 4 00:45:36 CEST 2015

https://hg.python.org/cpython/rev/984b96ea0ba7
changeset: 97228:984b96ea0ba7
branch: 3.4
parent: 97221:1c1c508d1b98
parent: 97225:06852194f541
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Aug 03 18:41:16 2015 -0400
summary:
 Merge
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
