Merge with 3.5

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")