Merge branch 'ttk' into v0.14.x

Author: edschofield

src/future/moves/tkinter/ttk.py

@@ -0,0 +1,13 @@
+from __future__ import absolute_import
+
+from future.utils import PY3
+
+if PY3:
+    from tkinter.ttk import *
+else:
+    try:
+        from ttk import *
+    except ImportError:
+        raise ImportError('The ttk module is missing. Does your Py2 '
+                          'installation include tkinter?')
+

src/future/standard_library/__init__.py

@@ -55,7 +55,6 @@
     import dbm.dumb
     import dbm.gnu
     import collections.abc  # on Py33
-    import tkinter
     import pickle     # should (optionally) bring in cPickle on Python 2
 
 """

src/libpasteurize/fixes/fix_imports.py

@@ -40,6 +40,7 @@
            u"tkinter.colorchooser": u"tkColorChooser",
            u"tkinter.commondialog": u"tkCommonDialog",
            u"tkinter.font": u"tkFont",
+           u"tkinter.ttk": u"ttk",
            u"tkinter.messagebox": u"tkMessageBox",
            u"tkinter.turtle": u"turtle",
            u"urllib.robotparser": u"robotparser",

src/tkinter/ttk.py

@@ -9,5 +9,5 @@
         from ttk import *
     except ImportError:
         raise ImportError('The ttk module is missing. Does your Py2 '
-                          'installation include Tkinter?')
+                          'installation include tkinter?')