Index: lib2to3/fixes/fix_imports.py
===================================================================
--- lib2to3/fixes/fix_imports.py	(revision 63455)
+++ lib2to3/fixes/fix_imports.py	(working copy)
@@ -45,7 +45,72 @@
                              'ConfigParser', 'SafeConfigParser',
                              'RawConfigParser', 'DEFAULTSECT',
                              'MAX_INTERPOLATION_DEPTH']),
-           'repr': ('reprlib', ['Repr', 'repr'])
+           'repr': ('reprlib', ['Repr', 'repr']),
+           'FileDialog': ('tkinter.filedialog',
+                          ['FileDialog', 'LoadFileDialog', 'SaveFileDialog']),
+           'tkFileDialog': ('tkinter.filedialog',
+                            ['FileDialog', 'LoadFileDialog', 'SaveFileDialog']),
+           'SimpleDialog': ('tkinter.simpledialog', ['SimpleDialog']),
+           'tkSimpleDialog': ('tkinter.simpledialog',
+                              ['Dialog', 'askinteger', 'askfloat',
+                               'askstring']),
+           'tkColorChooser': ('tkinter.colorchooser', ['Chooser', 'askcolor']),
+           'tkCommonDialog': ('tkinter.commondialog', ['Dialog']),
+           'Dialog': ('tkinter.dialog', ['Dialog']),
+           'Tkdnd': ('tkinter.dnd', ['DndHandler']),
+           'tkFont': ('tkinter.font',
+                      ['nametofont', 'Font', 'families', 'names']),
+           'tkMessageBox': ('tkinter.messagebox',
+                            ['Message', 'showinfo', 'showwarning', 'showerror',
+                             'askquestion', 'askokcancel', 'askyesno',
+                             'askyesnocancel', 'askretrycancel']),
+           'ScrolledText': ('tkinter.scrolledtext', ['ScrolledText']),
+           'turtle': ('tkinter.turtle',
+                      ['RawPen', 'Pen', 'Turtle', 'degrees', 'radian', 'reset',
+                       'clear', 'tracer', 'forward', 'backward', 'left',
+                       'right', 'up', 'down', 'width', 'color', 'write', 'fill',
+                       'begin_fill', 'end_fill', 'circle', 'goto', 'heading',
+                       'setheading', 'position', 'window_width', 'setx', 'sety',
+                       'towards', 'done', 'delay', 'speed', 'setup', 'title']),
+           'Tkconstants': ('tkinter.constants',
+                           ['NO', 'FALSE', 'OFF', 'YES', 'TRUE', 'ON', 'N', 'S',
+                            'W', 'E', 'NW', 'SW', 'SE', 'NE', 'NS', 'EW',
+                            'NSEW', 'CENTER', 'NONE', 'X', 'Y', 'BOTH', 'LEFT',
+                            'TOP', 'RIGHT', 'BOTTOM', 'RAISED', 'SUNKEN',
+                            'FLAT', 'RIDGE', 'GROOVE', 'SOLID', 'HORIZONTAL',
+                            'VERTICAL', 'NUMERIC', 'CHAR', 'WORD', 'BASELINE',
+                            'INSIDE', 'OUTSIDE', 'SEL', 'SEL_FIRST', 'SEL_LAST',
+                            'END', 'INSERT', 'CURRENT', 'ANCHOR', 'ALL',
+                            'NORMAL', 'DISABLED', 'ACTIVE', 'HIDDEN', 'CASCADE',
+                            'CHECKBUTTON', 'COMMAND', 'RADIOBUTTON',
+                            'SEPARATOR', 'SINGLE', 'BROWSE', 'MULTIPLE',
+                            'EXTENDED', 'DOTBOX', 'UNDERLINE', 'PIESLICE',
+                            'CHORD', 'ARC', 'FIRST', 'LAST', 'BUTT',
+                            'PROJECTING', 'ROUND', 'BEVEL', 'MITTER', 'MOVETO',
+                            'SCROLL', 'UNITS', 'PAGES']),
+           'Tix': ('tkinter.tix',
+                   ['tixCommand', 'Tk', 'Form', 'TixWidget', 'TixSubWidget',
+                    'DisplayStyle', 'Balloon', 'ButtonBox', 'ComboBox',
+                    'Control', 'DirList', 'DirTree', 'DirSelectBox',
+                    'ExFileSelectBox', 'DirSelectDialog', 'ExFileSelectDialog',
+                    'FileSelectBox', 'FileSelectDialog', 'FileEntry', 'HList',
+                    'InputOnly', 'LabelEntry', 'LabelFrame', 'ListNoteBook',
+                    'Meter', 'NoteBook', 'OptionMenu', 'PanedWindow',
+                    'PopupMenu', 'ResizeHandle', 'ScrolledHList',
+                    'ScrolledListBox', 'ScrolledText', 'ScrolledTList',
+                    'ScrolledWindow', 'Select', 'Shell', 'DialogShell',
+                    'StdButtonBox', 'TList', 'Tree', 'CheckList', 'OptionName',
+                    'FileTypeList', 'Grid', 'ScrolledGrid']),
+           'Tkinter': ('tkinter',
+                       ['_flatten', 'TclError', 'TkVersion', 'TclVersion',
+                        'Variable', 'StringVar', 'IntVar', 'DoubleVar',
+                        'BooleanVar','mainloop', 'Tk', 'Tcl', 'Toplevel',
+                        'Button', 'Canvas', 'Checkbutton', 'Entry', 'Frame',
+                        'Label', 'Listbox', 'Menu', 'Menubutton',
+                        'Radiobutton', 'Scale', 'Scrollbar', 'Text',
+                        'OptionMenu', 'Image', 'PhotoImage', 'BitmapImage',
+                        'image_names', 'image_types', 'Spinbox', 'LabelFrame',
+                        'PanedWindow', 'Studbutton', 'Tributton'])
            }