From 074d6e1f563818d2b56b84a31945c161c538c5c6 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 6 Mar 2000 14:16:41 +0000 Subject: [PATCH] Don't use 1.6-isms (s.startswith()) -- we want to distribute this before 1.6 is out so it has to be compatible with 1.5.2. --- Tools/idle/IdleConf.py | 4 ++-- Tools/idle/ParenMatch.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tools/idle/IdleConf.py b/Tools/idle/IdleConf.py index 4d6ca4d68e5..df5d9f83116 100644 --- a/Tools/idle/IdleConf.py +++ b/Tools/idle/IdleConf.py @@ -91,10 +91,10 @@ def load(dir): global _dir _dir = dir - if sys.platform.startswith('win'): + if sys.platform[:3] == 'win': genplatfile = os.path.join(dir, "config-win.txt") # XXX don't know what the platform string is on a Mac - elif sys.platform.startswith('mac'): + elif sys.platform[:3] == 'mac': genplatfile = os.path.join(dir, "config-mac.txt") else: genplatfile = os.path.join(dir, "config-unix.txt") diff --git a/Tools/idle/ParenMatch.py b/Tools/idle/ParenMatch.py index d8482b9f457..9f9e2ea06b4 100644 --- a/Tools/idle/ParenMatch.py +++ b/Tools/idle/ParenMatch.py @@ -177,10 +177,10 @@ class LastOpenBracketFinder: if i is None \ or keysym_type(buf[i]) != right_keysym_type: return None - lines_back = buf[i:].count("\n") - 1 + lines_back = string.count(buf[i:], "\n") - 1 # subtract one for the "\n" added to please the parser upto_open = buf[:i] - j = upto_open.rfind("\n") + 1 # offset of column 0 of line + j = string.rfind(upto_open, "\n") + 1 # offset of column 0 of line offset = i - j return "%d.%d" % (lno - lines_back, offset)