From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 16 Aug 2016 05:44:31 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0b1~709
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f050a33ce28df597ce0be5f80f1fc6b2c2e3e52a;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

f050a33ce28df597ce0be5f80f1fc6b2c2e3e52a
diff --cc Lib/tkinter/tix.py
index 3d38e5db070a,89113fd1eb0c..04465aa4d732
--- a/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)