Add more underscore-prefixed imports to tkinter (issue #233)

Author: edschofield

src/future/moves/tkinter/__init__.py

@@ -4,6 +4,8 @@
 
 if not PY3:
     from Tkinter import *
-    from Tkinter import _flatten, _cnfmerge
+    from Tkinter import (_cnfmerge, _default_root, _flatten, _join, _setit,
+                         _splitdict, _stringify, _support_default_root, _test,
+                         _tkinter)
 else:
     from tkinter import *

src/tkinter/__init__.py

@@ -3,7 +3,9 @@
 
 if sys.version_info[0] < 3:
     from Tkinter import *
-    from Tkinter import _flatten, _cnfmerge
+    from Tkinter import (_cnfmerge, _default_root, _flatten, _join, _setit,
+                         _splitdict, _stringify, _support_default_root, _test,
+                         _tkinter)
 else:
     raise ImportError('This package should not be accessible on Python 3. '
                       'Either you are trying to run from the python-future src folder '

src/tkinter/filedialog.py

@@ -10,4 +10,8 @@
     except ImportError:
         raise ImportError('The FileDialog module is missing. Does your Py2 '
                           'installation include tkinter?')
-
+    try:
+        from tkFileDialog import *
+    except ImportError:
+        raise ImportError('The tkFileDialog module is missing. Does your Py2 '
+                          'installation include tkinter?')