String method conversion.
diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index c4e78a2..da436c1 100644
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -37,14 +37,13 @@
TclError = _tkinter.TclError
from types import *
from Tkconstants import *
-import string; _string = string; del string
try:
import MacOS; _MacOS = MacOS; del MacOS
except ImportError:
_MacOS = None
-TkVersion = _string.atof(_tkinter.TK_VERSION)
-TclVersion = _string.atof(_tkinter.TCL_VERSION)
+TkVersion = float(_tkinter.TK_VERSION)
+TclVersion = float(_tkinter.TCL_VERSION)
READABLE = _tkinter.READABLE
WRITABLE = _tkinter.WRITABLE
@@ -782,7 +781,7 @@
return t[:1] + tuple(map(self.__winfo_getint, t[1:]))
def __winfo_getint(self, x):
"""Internal function."""
- return _string.atoi(x, 0)
+ return int(x, 0)
def winfo_vrootheight(self):
"""Return the height of the virtual root window associated with this
widget in pixels. If there is no virtual root window return the
@@ -850,7 +849,7 @@
%
(add and '+' or '',
funcid,
- _string.join(self._subst_format)))
+ " ".join(self._subst_format)))
self.tk.call(what + (sequence, cmd))
return funcid
elif sequence:
@@ -972,9 +971,8 @@
if name[0] == '.':
w = w._root()
name = name[1:]
- find = _string.find
while name:
- i = find(name, '.')
+ i = name.find('.')
if i >= 0:
name, tail = name[:i], name[i+1:]
else: