summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2015-08-03 22:34:45 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2015-08-03 22:34:45 (GMT)
commitf71a79cb72dd1736daacb61dc4f388f175ee31f5 (patch)
treec21a81df91ec94bda375ad940ba9fccc572ea805 /Lib
parent13b74aef6249c65e2b085a581ae9dea8c88ad8d5 (diff)
parent2f7de53993ebb3a7271f35a4160a2ac8b7a1d142 (diff)
downloadcpython-f71a79cb72dd1736daacb61dc4f388f175ee31f5.zip
cpython-f71a79cb72dd1736daacb61dc4f388f175ee31f5.tar.gz
cpython-f71a79cb72dd1736daacb61dc4f388f175ee31f5.tar.bz2
Issue #24759: Merge with 3.4
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/idlelib/PyShell.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 4f7a6de..3869d45 100755
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -23,16 +23,6 @@ except ImportError:
"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