mirror of
https://github.com/python/cpython.git
synced 2025-11-13 07:26:31 +00:00
De-string-module-ification.
This commit is contained in:
parent
60e1886e87
commit
8e4fa072f7
2 changed files with 11 additions and 10 deletions
|
|
@ -6,7 +6,6 @@ It is used to bring up other windows.
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import string
|
|
||||||
from Tkinter import *
|
from Tkinter import *
|
||||||
import tkMessageBox
|
import tkMessageBox
|
||||||
import tkFileDialog
|
import tkFileDialog
|
||||||
|
|
@ -221,9 +220,9 @@ class Helpwin:
|
||||||
fp = open(readmefile)
|
fp = open(readmefile)
|
||||||
contents = fp.read()
|
contents = fp.read()
|
||||||
# wax the last page, it contains Emacs cruft
|
# wax the last page, it contains Emacs cruft
|
||||||
i = string.rfind(contents, '\f')
|
i = contents.rfind('\f')
|
||||||
if i > 0:
|
if i > 0:
|
||||||
contents = string.rstrip(contents[:i])
|
contents = contents[:i].rstrip()
|
||||||
finally:
|
finally:
|
||||||
if fp:
|
if fp:
|
||||||
fp.close()
|
fp.close()
|
||||||
|
|
@ -258,11 +257,11 @@ class PopupViewer:
|
||||||
self.__root = root
|
self.__root = root
|
||||||
self.__menutext = module.ADDTOVIEW
|
self.__menutext = module.ADDTOVIEW
|
||||||
# find the underline character
|
# find the underline character
|
||||||
underline = string.find(module.ADDTOVIEW, '%')
|
underline = module.ADDTOVIEW.find('%')
|
||||||
if underline == -1:
|
if underline == -1:
|
||||||
underline = 0
|
underline = 0
|
||||||
else:
|
else:
|
||||||
self.__menutext = string.replace(module.ADDTOVIEW, '%', '', 1)
|
self.__menutext = module.ADDTOVIEW.replace('%', '', 1)
|
||||||
self.__underline = underline
|
self.__underline = underline
|
||||||
self.__window = None
|
self.__window = None
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ select the color under the cursor while you drag it, but be forewarned that
|
||||||
this can be slow.
|
this can be slow.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import string
|
|
||||||
from Tkinter import *
|
from Tkinter import *
|
||||||
import ColorDB
|
import ColorDB
|
||||||
|
|
||||||
|
|
@ -46,7 +45,10 @@ BTNDOWN = 4
|
||||||
BTNUP = 5
|
BTNUP = 5
|
||||||
BTNDRAG = 6
|
BTNDRAG = 6
|
||||||
|
|
||||||
|
SPACE = ' '
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def constant(numchips):
|
def constant(numchips):
|
||||||
step = 255.0 / (numchips - 1)
|
step = 255.0 / (numchips - 1)
|
||||||
start = 0.0
|
start = 0.0
|
||||||
|
|
@ -141,7 +143,7 @@ class RightArrow(LeftArrow):
|
||||||
width=3.0,
|
width=3.0,
|
||||||
tags=self._TAG)
|
tags=self._TAG)
|
||||||
text = self._canvas.create_text(
|
text = self._canvas.create_text(
|
||||||
x - self._ARROWWIDTH + 15, # TBD: kludge
|
x - self._ARROWWIDTH + 15, # BAW: kludge
|
||||||
self._ARROWHEIGHT - self._TEXTYOFFSET,
|
self._ARROWHEIGHT - self._TEXTYOFFSET,
|
||||||
justify=RIGHT,
|
justify=RIGHT,
|
||||||
text='128',
|
text='128',
|
||||||
|
|
@ -151,7 +153,7 @@ class RightArrow(LeftArrow):
|
||||||
def _x(self):
|
def _x(self):
|
||||||
coords = self._canvas.bbox(self._TAG)
|
coords = self._canvas.bbox(self._TAG)
|
||||||
assert coords
|
assert coords
|
||||||
return coords[2] - 6 # TBD: kludge
|
return coords[2] - 6 # BAW: kludge
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -182,7 +184,7 @@ class StripWidget:
|
||||||
self.__sb = switchboard
|
self.__sb = switchboard
|
||||||
|
|
||||||
canvaswidth = numchips * (chipwidth + 1)
|
canvaswidth = numchips * (chipwidth + 1)
|
||||||
canvasheight = chipheight + 43 # TBD: Kludge
|
canvasheight = chipheight + 43 # BAW: Kludge
|
||||||
|
|
||||||
# create the canvas and pack it
|
# create the canvas and pack it
|
||||||
canvas = self.__canvas = Canvas(master,
|
canvas = self.__canvas = Canvas(master,
|
||||||
|
|
@ -301,7 +303,7 @@ class StripWidget:
|
||||||
chip = i
|
chip = i
|
||||||
i = i + 1
|
i = i + 1
|
||||||
# call the raw tcl script
|
# call the raw tcl script
|
||||||
colors = string.join(chips)
|
colors = SPACE.join(chips)
|
||||||
tk.eval('setcolor %s {%s}' % (self.__canvas._w, colors))
|
tk.eval('setcolor %s {%s}' % (self.__canvas._w, colors))
|
||||||
# move the arrows around
|
# move the arrows around
|
||||||
self.__trackarrow(chip, (red, green, blue))
|
self.__trackarrow(chip, (red, green, blue))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue