Merge with 3.5

diff --cc Lib/tkinter/tix.py
index 3d38e5db070a7ded63a4623560613d4efdea7976,89113fd1eb0ce30b827da22436d6ccd1606f2fdb..04465aa4d73284050e8bd4efa20b1751183d0735
--- 1/Lib/tkinter/tix.py
--- 2/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@@ -26,9 -26,15 +26,11 @@@
  # appreciate the advantages.
  #
  
+ import os
+ import tkinter
  from tkinter import *
- from tkinter import _cnfmerge, _default_root
+ from tkinter import _cnfmerge
  
 -# WARNING - TkVersion is a limited precision floating point number
 -if TkVersion < 3.999:
 -    raise ImportError("This version of Tix.py requires Tk 4.0 or higher")
 -
  import _tkinter # If this fails your Python may not be configured for Tk
  
  # Some more constants (for consistency with Tkinter)