diff options
Diffstat (limited to 'Demo')
| -rw-r--r-- | Demo/tkinter/guido/AttrDialog.py | 2 | ||||
| -rw-r--r-- | Demo/tkinter/guido/ManPage.py | 8 | ||||
| -rw-r--r-- | Demo/tkinter/guido/brownian2.py | 2 | ||||
| -rwxr-xr-x | Demo/tkinter/guido/kill.py | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/Demo/tkinter/guido/AttrDialog.py b/Demo/tkinter/guido/AttrDialog.py index 5508e3b..44d9766 100644 --- a/Demo/tkinter/guido/AttrDialog.py +++ b/Demo/tkinter/guido/AttrDialog.py @@ -120,7 +120,7 @@ class Dialog: cl = self.classes[c] except KeyError: cl = 'unknown' - if type(cl) == TupleType: + if type(cl) == tuple: cl = self.enumoption elif cl == 'boolean': cl = self.booleanoption diff --git a/Demo/tkinter/guido/ManPage.py b/Demo/tkinter/guido/ManPage.py index a9309a3..d4b4abe 100644 --- a/Demo/tkinter/guido/ManPage.py +++ b/Demo/tkinter/guido/ManPage.py @@ -107,13 +107,13 @@ class EditableManPage(ScrolledText): # Save this line -- we need one line read-ahead self.buffer = nextline return - if emptyprog.match(self.buffer) >= 0: + if emptyprog.match(self.buffer): # Buffered line was empty -- set a flag self.empty = 1 self.buffer = nextline return textline = self.buffer - if ulprog.match(nextline) >= 0: + if ulprog.match(nextline): # Next line is properties for buffered line propline = nextline self.buffer = None @@ -127,7 +127,7 @@ class EditableManPage(ScrolledText): self.ok = 1 self.empty = 0 return - if footerprog.match(textline) >= 0: + if footerprog.match(textline): # Footer -- start skipping until next non-blank line self.ok = 0 self.empty = 0 @@ -190,7 +190,7 @@ def test(): import os import sys # XXX This directory may be different on your system - MANDIR = '/usr/local/man/mann' + MANDIR = '' DEFAULTPAGE = 'Tcl' formatted = 0 if sys.argv[1:] and sys.argv[1] == '-f': diff --git a/Demo/tkinter/guido/brownian2.py b/Demo/tkinter/guido/brownian2.py index dc1d43a..3adcd68 100644 --- a/Demo/tkinter/guido/brownian2.py +++ b/Demo/tkinter/guido/brownian2.py @@ -32,7 +32,7 @@ def particle(canvas): # particle = iterator over the moves yield None def move(particle): # move the particle at random time - particle.next() + next(particle) dt = random.expovariate(LAMBDA) root.after(int(dt*1000), move, particle) diff --git a/Demo/tkinter/guido/kill.py b/Demo/tkinter/guido/kill.py index dd01a2d..44a6b9b 100755 --- a/Demo/tkinter/guido/kill.py +++ b/Demo/tkinter/guido/kill.py @@ -2,8 +2,6 @@ # Tkinter interface to Linux `kill' command. from tkinter import * -from string import splitfields -from string import split import subprocess import os @@ -26,13 +24,13 @@ class Kill(Frame): ('Hex', '-X', 0)] def kill(self, selected): c = self.format_list[self.format.get()][2] - pid = split(selected)[c] + pid = selected.split()[c] os.system('kill -9 ' + pid) self.do_update() def do_update(self): name, option, column = self.format_list[self.format.get()] s = subprocess.getoutput('ps -w ' + option) - list = splitfields(s, '\n') + list = s.split('\n') self.header.set(list[0]) del list[0] y = self.frame.vscroll.get()[0] |