summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter/tix.py
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-08-16 05:44:31 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2016-08-16 05:44:31 (GMT)
commitf050a33ce28df597ce0be5f80f1fc6b2c2e3e52a (patch)
tree4cdd2438cc3ece8349e32d0bd16e29f91a628281 /Lib/tkinter/tix.py
parent4770d6ec76328075b66b9f1c9291f537af626ab1 (diff)
parent22ba01ea550a0a6a0bb1e2a6f2758acd46797d2b (diff)
downloadcpython-f050a33ce28df597ce0be5f80f1fc6b2c2e3e52a.zip
cpython-f050a33ce28df597ce0be5f80f1fc6b2c2e3e52a.tar.gz
cpython-f050a33ce28df597ce0be5f80f1fc6b2c2e3e52a.tar.bz2
Merge with 3.5
Diffstat (limited to 'Lib/tkinter/tix.py')
-rw-r--r--Lib/tkinter/tix.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index 3d38e5d..04465aa 100644
--- 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 @@ TCL_ALL_EVENTS = 0
# 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 @@ class DisplayStyle:
(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")