diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2002-09-15 22:09:16 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2002-09-15 22:09:16 (GMT) |
| commit | a2876442047ac41abce63b5d0e987e9d807c694f (patch) | |
| tree | 306ccfaace9fbe890f42c265642f3b9a6e13d862 | |
| parent | 908aece9f755e4418c19c26b036949b19b2162d3 (diff) | |
| download | cpython-a2876442047ac41abce63b5d0e987e9d807c694f.zip cpython-a2876442047ac41abce63b5d0e987e9d807c694f.tar.gz cpython-a2876442047ac41abce63b5d0e987e9d807c694f.tar.bz2 | |
Merge Py Idle changes
Rev 1.13 (string methods)
| -rw-r--r-- | Lib/idlelib/ClassBrowser.py | 3 | ||||
| -rw-r--r-- | Lib/idlelib/ColorDelegator.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Lib/idlelib/ClassBrowser.py b/Lib/idlelib/ClassBrowser.py index 19f3b7e..6e4b2a3 100644 --- a/Lib/idlelib/ClassBrowser.py +++ b/Lib/idlelib/ClassBrowser.py @@ -12,7 +12,6 @@ XXX TO DO: import os import sys -import string import pyclbr # XXX Patch pyclbr with dummies if it's vintage Python 1.5.2: @@ -117,7 +116,7 @@ class ModuleBrowserTreeItem(TreeItem): if sup.module != cl.module: sname = "%s.%s" % (sup.module, sname) supers.append(sname) - s = s + "(%s)" % string.join(supers, ", ") + s = s + "(%s)" % ", ".join(supers) items.append((cl.lineno, s)) self.classes[s] = cl items.sort() diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/ColorDelegator.py index ab84060..c505beb 100644 --- a/Lib/idlelib/ColorDelegator.py +++ b/Lib/idlelib/ColorDelegator.py @@ -1,5 +1,4 @@ import time -import string import re import keyword from Tkinter import * @@ -14,7 +13,7 @@ DEBUG = 0 def any(name, list): - return "(?P<%s>" % name + string.join(list, "|") + ")" + return "(?P<%s>" % name + "|".join(list) + ")" def make_pat(): kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b" |