De-string-module-ification.

This commit is contained in:
Barry Warsaw 2001-07-10 21:44:24 +00:00
parent 60e1886e87
commit 8e4fa072f7
2 changed files with 11 additions and 10 deletions

View File

@ -6,7 +6,6 @@
import sys
import os
import string
from Tkinter import *
import tkMessageBox
import tkFileDialog
@ -221,9 +220,9 @@ def __init__(self, master, quitfunc):
fp = open(readmefile)
contents = fp.read()
# wax the last page, it contains Emacs cruft
i = string.rfind(contents, '\f')
i = contents.rfind('\f')
if i > 0:
contents = string.rstrip(contents[:i])
contents = contents[:i].rstrip()
finally:
if fp:
fp.close()
@ -258,11 +257,11 @@ def __init__(self, module, name, switchboard, root):
self.__root = root
self.__menutext = module.ADDTOVIEW
# find the underline character
underline = string.find(module.ADDTOVIEW, '%')
underline = module.ADDTOVIEW.find('%')
if underline == -1:
underline = 0
else:
self.__menutext = string.replace(module.ADDTOVIEW, '%', '', 1)
self.__menutext = module.ADDTOVIEW.replace('%', '', 1)
self.__underline = underline
self.__window = None

View File

@ -24,7 +24,6 @@
this can be slow.
"""
import string
from Tkinter import *
import ColorDB
@ -46,7 +45,10 @@
BTNUP = 5
BTNDRAG = 6
SPACE = ' '
def constant(numchips):
step = 255.0 / (numchips - 1)
start = 0.0
@ -141,7 +143,7 @@ def _create(self, x):
width=3.0,
tags=self._TAG)
text = self._canvas.create_text(
x - self._ARROWWIDTH + 15, # TBD: kludge
x - self._ARROWWIDTH + 15, # BAW: kludge
self._ARROWHEIGHT - self._TEXTYOFFSET,
justify=RIGHT,
text='128',
@ -151,7 +153,7 @@ def _create(self, x):
def _x(self):
coords = self._canvas.bbox(self._TAG)
assert coords
return coords[2] - 6 # TBD: kludge
return coords[2] - 6 # BAW: kludge
@ -182,7 +184,7 @@ def __init__(self, switchboard,
self.__sb = switchboard
canvaswidth = numchips * (chipwidth + 1)
canvasheight = chipheight + 43 # TBD: Kludge
canvasheight = chipheight + 43 # BAW: Kludge
# create the canvas and pack it
canvas = self.__canvas = Canvas(master,
@ -301,7 +303,7 @@ def update_yourself(self, red, green, blue):
chip = i
i = i + 1
# call the raw tcl script
colors = string.join(chips)
colors = SPACE.join(chips)
tk.eval('setcolor %s {%s}' % (self.__canvas._w, colors))
# move the arrows around
self.__trackarrow(chip, (red, green, blue))