From: Kurt B. Kaiser <kbk@shore.net>
Date: Tue, 17 Sep 2002 03:43:38 +0000 (+0000)
Subject: Merge Py Idle changes:
X-Git-Tag: v2.3c1~4048
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8e20a0e6b597419b8bbec9cd7d76f3ea5067679;p=thirdparty%2FPython%2Fcpython.git

Merge Py Idle changes:
Rev 1.6 doerwalter
(string methods)
---

diff --git a/Lib/idlelib/ParenMatch.py b/Lib/idlelib/ParenMatch.py
index db6fb6c80071..678d1fd80de7 100644
--- a/Lib/idlelib/ParenMatch.py
+++ b/Lib/idlelib/ParenMatch.py
@@ -10,8 +10,6 @@ We'll have to fix IDLE to do something reasonable when two or more
 extensions what to capture the same event.
 """
 
-import string
-
 import PyParse
 from AutoIndent import AutoIndent, index2line
 from configHandler import idleConf
@@ -166,10 +164,10 @@ class LastOpenBracketFinder:
         if i is None \
            or keysym_type(buf[i]) != right_keysym_type:
             return None
-        lines_back = string.count(buf[i:], "\n") - 1
+        lines_back = buf[i:].count("\n") - 1
         # subtract one for the "\n" added to please the parser
         upto_open = buf[:i]
-        j = string.rfind(upto_open, "\n") + 1 # offset of column 0 of line
+        j = upto_open.rfind("\n") + 1 # offset of column 0 of line
         offset = i - j
         return "%d.%d" % (lno - lines_back, offset)