]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
De-string-module-ification.
authorBarry Warsaw <barry@python.org>
Tue, 10 Jul 2001 21:44:24 +0000 (21:44 +0000)
committerBarry Warsaw <barry@python.org>
Tue, 10 Jul 2001 21:44:24 +0000 (21:44 +0000)
Tools/pynche/PyncheWidget.py
Tools/pynche/StripViewer.py

index a7a0666ee9addd243b26ddba3610fb8fe87f0f90..855007861c2c5c27f8bb283cf679b81fe74f665c 100644 (file)
@@ -6,7 +6,6 @@ It is used to bring up other windows.
 
 import sys
 import os
-import string
 from Tkinter import *
 import tkMessageBox
 import tkFileDialog
@@ -221,9 +220,9 @@ class Helpwin:
                 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 @@ class PopupViewer:
         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
 
index 8205a9a877e30ab8613010449ef205fd9c87bad6..b190482a05514b8bb76a6038a12515e14b0517f6 100644 (file)
@@ -24,7 +24,6 @@ select the color under the cursor while you drag it, but be forewarned that
 this can be slow.
 """
 
-import string
 from Tkinter import *
 import ColorDB
 
@@ -46,7 +45,10 @@ BTNDOWN = 4
 BTNUP = 5
 BTNDRAG = 6
 
+SPACE = ' '
 
+
+\f
 def constant(numchips):
     step = 255.0 / (numchips - 1)
     start = 0.0
@@ -141,7 +143,7 @@ class RightArrow(LeftArrow):
            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 @@ class RightArrow(LeftArrow):
     def _x(self):
        coords = self._canvas.bbox(self._TAG)
        assert coords
-       return coords[2] - 6                      # TBD: kludge
+       return coords[2] - 6                      # BAW: kludge
 
 
 \f
@@ -182,7 +184,7 @@ class StripWidget:
         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 @@ class StripWidget:
                 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))