From: Kurt B. Kaiser <kbk@shore.net>
Date: Sun, 15 Sep 2002 22:09:16 +0000 (+0000)
Subject: Merge Py Idle changes
X-Git-Tag: v2.3c1~4065
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2876442047ac41abce63b5d0e987e9d807c694f;p=thirdparty%2FPython%2Fcpython.git

Merge Py Idle changes
Rev 1.13 (string methods)
---

diff --git a/Lib/idlelib/ClassBrowser.py b/Lib/idlelib/ClassBrowser.py
index 19f3b7e6003c..6e4b2a32eeab 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 ab840608c0f3..c505beb9d999 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"