Tkinter rename, step 2: fix imports and add stub modules.

Lib/lib-tk/Canvas.py

@@ -7,7 +7,7 @@ from warnings import warnpy3k
 warnpy3k("the Canvas module has been removed in Python 3.0", stacklevel=2)
 del warnpy3k
 
-from Tkinter import Canvas, _cnfmerge, _flatten
+from tkinter import Canvas, _cnfmerge, _flatten
 
 
 class CanvasItem:

Lib/lib-tk/FileDialog.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the FileDialog module has been renamed "
+         "to 'tkinter.filedialog' in Python 3.0", stacklevel=2)
+
+import tkinter.filedialog
+sys.modules[__name__] = tkinter.filedialog

Lib/lib-tk/FixTk.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the FixTk module has been renamed "
+         "to 'tkinter._fix' in Python 3.0", stacklevel=2)
+
+import tkinter._fix
+sys.modules[__name__] = tkinter._fix

Lib/lib-tk/ScrolledText.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the ScrolledText module has been renamed "
+         "to 'tkinter.scrolledtext' in Python 3.0", stacklevel=2)
+
+import tkinter.scrolledtext
+sys.modules[__name__] = tkinter.scrolledtext

Lib/lib-tk/SimpleDialog.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the SimpleDialog module has been renamed "
+         "to 'tkinter.simpledialog' in Python 3.0", stacklevel=2)
+
+import tkinter.simpledialog
+sys.modules[__name__] = tkinter.simpledialog

Lib/lib-tk/Tix.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the Tix module has been renamed "
+         "to 'tkinter.tix' in Python 3.0", stacklevel=2)
+
+import tkinter.tix
+sys.modules[__name__] = tkinter.tix

Lib/lib-tk/Tkconstants.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the Tkconstants module has been renamed "
+         "to 'tkinter.constants' in Python 3.0", stacklevel=2)
+
+import tkinter.constants
+sys.modules[__name__] = tkinter.constants

Lib/lib-tk/Tkdnd.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the Tkdnd module has been renamed "
+         "to 'tkinter.dnd' in Python 3.0", stacklevel=2)
+
+import tkinter.dnd
+sys.modules[__name__] = tkinter.dnd

Lib/lib-tk/Tkinter.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the Tkinter module has been renamed "
+         "to 'tkinter' in Python 3.0", stacklevel=2)
+
+import tkinter
+sys.modules[__name__] = tkinter

Lib/lib-tk/tkColorChooser.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the tkColorChooser module has been renamed "
+         "to 'tkinter.colorchooser' in Python 3.0", stacklevel=2)
+
+import tkinter.colorchooser
+sys.modules[__name__] = tkinter.colorchooser

Lib/lib-tk/tkCommonDialog.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the tkCommonDialog module has been renamed "
+         "to 'tkinter.commondialog' in Python 3.0", stacklevel=2)
+
+import tkinter.commondialog
+sys.modules[__name__] = tkinter.commondialog

Lib/lib-tk/tkFont.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the tkFont module has been renamed "
+         "to 'tkinter.font' in Python 3.0", stacklevel=2)
+
+import tkinter.font
+sys.modules[__name__] = tkinter.font

Lib/lib-tk/tkMessageBox.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the tkMessageBox module has been renamed "
+         "to 'tkinter.messagebox' in Python 3.0", stacklevel=2)
+
+import tkinter.messagebox
+sys.modules[__name__] = tkinter.messagebox

Lib/lib-tk/turtle.py

@@ -0,0 +1,8 @@
+import sys
+from warnings import warnpy3k
+
+warnpy3k("the turtle module has been renamed "
+         "to 'tkinter.turtle' in Python 3.0", stacklevel=2)
+
+import tkinter.turtle
+sys.modules[__name__] = tkinter.turtle