Tkinter rename reversal: remove tkinter package, adapt imports and docs.
diff --git a/Lib/lib-tk/Tix.py b/Lib/lib-tk/Tix.py
index 22a9000..b7a0fc0 100755
--- a/Lib/lib-tk/Tix.py
+++ b/Lib/lib-tk/Tix.py
@@ -26,8 +26,8 @@
# appreciate the advantages.
#
-from tkinter import *
-from tkinter import _flatten, _cnfmerge, _default_root
+from Tkinter import *
+from Tkinter import _flatten, _cnfmerge, _default_root
# WARNING - TkVersion is a limited precision floating point number
if TkVersion < 3.999:
@@ -57,7 +57,7 @@
# BEWARE - this is implemented by copying some code from the Widget class
# in Tkinter (to override Widget initialization) and is therefore
# liable to break.
-import tkinter, os
+import Tkinter, os
# Could probably add this to Tkinter.Misc
class tixCommand:
@@ -192,11 +192,11 @@
else:
return self.tk.call('tix', 'resetoptions', newScheme, newFontSet)
-class Tk(tkinter.Tk, tixCommand):
+class Tk(Tkinter.Tk, tixCommand):
"""Toplevel widget of Tix which represents mostly the main window
of an application. It has an associated Tcl interpreter."""
def __init__(self, screenName=None, baseName=None, className='Tix'):
- tkinter.Tk.__init__(self, screenName, baseName, className)
+ Tkinter.Tk.__init__(self, screenName, baseName, className)
tixlib = os.environ.get('TIX_LIBRARY')
self.tk.eval('global auto_path; lappend auto_path [file dir [info nameof]]')
if tixlib is not None:
@@ -212,7 +212,7 @@
def destroy(self):
# For safety, remove an delete_window binding before destroy
self.protocol("WM_DELETE_WINDOW", "")
- tkinter.Tk.destroy(self)
+ Tkinter.Tk.destroy(self)
# The Tix 'tixForm' geometry manager
class Form:
@@ -260,9 +260,9 @@
-tkinter.Widget.__bases__ = tkinter.Widget.__bases__ + (Form,)
+Tkinter.Widget.__bases__ = Tkinter.Widget.__bases__ + (Form,)
-class TixWidget(tkinter.Widget):
+class TixWidget(Tkinter.Widget):
"""A TixWidget class is used to package all (or most) Tix widgets.
Widget initialization is extended in two ways:
@@ -383,7 +383,7 @@
# These are missing from Tkinter
def image_create(self, imgtype, cnf={}, master=None, **kw):
if not master:
- master = tkinter._default_root
+ master = Tkinter._default_root
if not master:
raise RuntimeError, 'Too early to create image'
if kw and cnf: cnf = _cnfmerge((cnf, kw))