Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Guido van Rossum 2000-03-06 14:16:41 +00:00
parent 9552665436
commit 074d6e1f56
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/idle/IdleConf.py
View File

@ -91,10 +91,10 @@ def load(dir):
global _dir global _dir
_dir = dir _dir = dir
if sys.platform.startswith('win'): if sys.platform[:3] == 'win':
genplatfile = os.path.join(dir, "config-win.txt") genplatfile = os.path.join(dir, "config-win.txt")
# XXX don't know what the platform string is on a Mac # 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") genplatfile = os.path.join(dir, "config-mac.txt")
else: else:
genplatfile = os.path.join(dir, "config-unix.txt") genplatfile = os.path.join(dir, "config-unix.txt")

4
Tools/idle/ParenMatch.py
View File

@ -177,10 +177,10 @@ class LastOpenBracketFinder:
if i is None \ if i is None \
or keysym_type(buf[i]) != right_keysym_type: or keysym_type(buf[i]) != right_keysym_type:
return None 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 # subtract one for the "\n" added to please the parser
upto_open = buf[:i] 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 offset = i - j
return "%d.%d" % (lno - lines_back, offset) return "%d.%d" % (lno - lines_back, offset)