Tkinter rename reversal: remove tkinter package, adapt imports and docs.

2 files changed, 2 insertions, 18 deletions

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index eb28b89..0641f7d 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -218,23 +218,7 @@ class TestStdlibRenames(unittest.TestCase):
     renames = {'copy_reg': 'copyreg', 'Queue': 'queue',
                'SocketServer': 'socketserver',
                'ConfigParser': 'configparser',
-               'repr': 'reprlib',
-               'FileDialog': 'tkinter.filedialog',
-               'FixTk': 'tkinter._fix',
-               'ScrolledText': 'tkinter.scrolledtext',
-               'SimpleDialog': 'tkinter.simpledialog',
-               'Tix': 'tkinter.tix',
-               'tkColorChooser': 'tkinter.colorchooser',
-               'tkCommonDialog': 'tkinter.commondialog',
-               'Tkconstants': 'tkinter.constants',
-               'Tkdnd': 'tkinter.dnd',
-               'tkFileDialog': 'tkinter.filedialog',
-               'tkFont': 'tkinter.font',
-               'Tkinter': 'tkinter',
-               'tkMessageBox': 'tkinter.messagebox',
-               'tkSimpleDialog': 'tkinter.simpledialog',
-               'turtle': 'tkinter.turtle'
-               }
+               'repr': 'reprlib'}
 
     def check_rename(self, module_name, new_module_name):
         """Make sure that:
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 6b41a17..fa170ef 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -3,7 +3,7 @@
 import unittest
 import os
 from test import test_support
-from tkinter import Tcl
+from Tkinter import Tcl
 from _tkinter import TclError
 
 class TclTest(unittest.TestCase):