[Python-checkins] cpython (merge 3.4 -> 3.5): Merge with 3.4
terry.reedy
python-checkins at python.org
Fri Jul 31 03:17:55 CEST 2015
https://hg.python.org/cpython/rev/3006f1e6a276
changeset: 97161:3006f1e6a276
branch: 3.5
parent: 97156:b6f04b9d8c12
parent: 97160:13a8782a775e
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Thu Jul 30 21:16:29 2015 -0400
summary:
Merge with 3.4
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
More information about the Python-checkins
mailing list