[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5
terry.reedy
python-checkins at python.org
Tue Aug 16 01:44:49 EDT 2016
https://hg.python.org/cpython/rev/965a6a5539f2
changeset: 102696:965a6a5539f2
parent: 102693:5c8e54d47221
parent: 102695:a42933335897
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Tue Aug 16 01:44:31 2016 -0400
summary:
Merge with 3.5
files:
Lib/tkinter/tix.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -26,8 +26,10 @@
# appreciate the advantages.
#
+import os
+import tkinter
from tkinter import *
-from tkinter import _cnfmerge, _default_root
+from tkinter import _cnfmerge
import _tkinter # If this fails your Python may not be configured for Tk
@@ -68,7 +70,6 @@
# BEWARE - this is implemented by copying some code from the Widget class
# in Tkinter (to override Widget initialization) and is therefore
# liable to break.
-import tkinter, os
# Could probably add this to Tkinter.Misc
class tixCommand:
@@ -472,7 +473,7 @@
(multiple) Display Items"""
def __init__(self, itemtype, cnf={}, **kw):
- master = _default_root # global from Tkinter
+ master = tkinter._default_root # global from Tkinter
if not master and 'refwindow' in cnf: master=cnf['refwindow']
elif not master and 'refwindow' in kw: master= kw['refwindow']
elif not master: raise RuntimeError("Too early to create display style: no root window")
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list