mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 12:45:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use string methods where possible, and remove import string

Browse source
This commit is contained in:
Neal Norwitz 2002-05-31 14:13:04 +00:00
parent 05ab2e693c
commit 7ce734cd72
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/markupbase.py
View file

@ -38,10 +38,10 @@ class ParserBase:
if i >= j:
return j
rawdata = self.rawdata
nlines = string.count(rawdata, "\n", i, j)
nlines = rawdata.count("\n", i, j)
if nlines:
self.lineno = self.lineno + nlines
pos = string.rindex(rawdata, "\n", i, j) # Should not fail
pos = rawdata.rindex("\n", i, j) # Should not fail
self.offset = j-(pos+1)
else:
self.offset = self.offset + j-i
@ -176,7 +176,7 @@ class ParserBase:
# style content model; just skip until '>'
rawdata = self.rawdata
if '>' in rawdata[j:]:
return string.find(rawdata, ">", j) + 1
return rawdata.find(">", j) + 1
return -1
# Internal -- scan past <!ATTLIST declarations
@ -200,7 +200,7 @@ class ParserBase:
if c == "(":
# an enumerated type; look for ')'
if ")" in rawdata[j:]:
j = string.find(rawdata, ")", j) + 1
j = rawdata.find(")", j) + 1
else:
return -1
while rawdata[j:j+1] in string.whitespace:
@ -307,7 +307,7 @@ class ParserBase:
name = s.strip()
if (i + len(s)) == n:
return None, -1 # end of buffer
return string.lower(name), m.end()
return name.lower(), m.end()
else:
self.updatepos(declstartpos, i)
self.error("expected name token")