[Python-checkins] CVS: python/dist/src/Lib xmllib.py,1.26,1.27
Eric S. Raymond
esr@users.sourceforge.net
Fri, 09 Feb 2001 02:44:35 -0800
Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv9110
Modified Files:
xmllib.py
Log Message:
String method conversion.
Index: xmllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xmllib.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** xmllib.py 2001/01/15 03:34:38 1.26
--- xmllib.py 2001/02/09 10:44:32 1.27
***************
*** 196,202 ****
if str[0] == '#':
if str[1] == 'x':
! str = chr(string.atoi(str[2:], 16))
else:
! str = chr(string.atoi(str[1:]))
if data[i - 1] != ';':
self.syntax_error("`;' missing after char reference")
--- 196,202 ----
if str[0] == '#':
if str[1] == 'x':
! str = chr(int(str[2:], 16))
else:
! str = chr(int(str[1:]))
if data[i - 1] != ';':
self.syntax_error("`;' missing after char reference")
***************
*** 246,250 ****
data = rawdata[i:n]
self.handle_data(data)
! self.lineno = self.lineno + string.count(data, '\n')
i = n
break
--- 246,250 ----
data = rawdata[i:n]
self.handle_data(data)
! self.lineno = self.lineno + data.count('\n')
i = n
break
***************
*** 264,268 ****
self.syntax_error('illegal character in content')
self.handle_data(data)
! self.lineno = self.lineno + string.count(data, '\n')
i = j
if i == n: break
--- 264,268 ----
self.syntax_error('illegal character in content')
self.handle_data(data)
! self.lineno = self.lineno + data.count('\n')
i = j
if i == n: break
***************
*** 272,276 ****
data = rawdata[i]
self.handle_data(data)
! self.lineno = self.lineno + string.count(data, '\n')
i = i+1
continue
--- 272,276 ----
data = rawdata[i]
self.handle_data(data)
! self.lineno = self.lineno + data.count('\n')
i = i+1
continue
***************
*** 278,282 ****
if k < 0: break
self.__seen_starttag = 1
! self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
--- 278,282 ----
if k < 0: break
self.__seen_starttag = 1
! self.lineno = self.lineno + rawdata[i:k].count('\n')
i = k
continue
***************
*** 284,288 ****
k = self.parse_endtag(i)
if k < 0: break
! self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
--- 284,288 ----
k = self.parse_endtag(i)
if k < 0: break
! self.lineno = self.lineno + rawdata[i:k].count('\n')
i = k
continue
***************
*** 291,300 ****
data = rawdata[i]
self.handle_data(data)
! self.lineno = self.lineno + string.count(data, '\n')
i = i+1
continue
k = self.parse_comment(i)
if k < 0: break
! self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
--- 291,300 ----
data = rawdata[i]
self.handle_data(data)
! self.lineno = self.lineno + data.count('\n')
i = i+1
continue
k = self.parse_comment(i)
if k < 0: break
! self.lineno = self.lineno + rawdata[i:k].count('\n')
i = k
continue
***************
*** 302,306 ****
k = self.parse_cdata(i)
if k < 0: break
! self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
--- 302,306 ----
k = self.parse_cdata(i)
if k < 0: break
! self.lineno = self.lineno + rawdata[i:k].count('\n')
i = k
continue
***************
*** 323,327 ****
k = self.parse_proc(i)
if k < 0: break
! self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
--- 323,327 ----
k = self.parse_proc(i)
if k < 0: break
! self.lineno = self.lineno + rawdata[i:k].count('\n')
i = k
continue
***************
*** 331,335 ****
data = rawdata[i]
self.handle_data(data)
! self.lineno = self.lineno + string.count(data, '\n')
i = i+1
continue
--- 331,335 ----
data = rawdata[i]
self.handle_data(data)
! self.lineno = self.lineno + data.count('\n')
i = i+1
continue
***************
*** 342,347 ****
self.__seen_doctype = res.group('name')
if self.__map_case:
! self.__seen_doctype = string.lower(self.__seen_doctype)
! self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
--- 342,347 ----
self.__seen_doctype = res.group('name')
if self.__map_case:
! self.__seen_doctype = self.__seen_doctype.lower()
! self.lineno = self.lineno + rawdata[i:k].count('\n')
i = k
continue
***************
*** 361,365 ****
self.syntax_error('data not in content')
self.handle_charref(res.group('char')[:-1])
! self.lineno = self.lineno + string.count(res.group(0), '\n')
continue
res = entityref.match(rawdata, i)
--- 361,365 ----
self.syntax_error('data not in content')
self.handle_charref(res.group('char')[:-1])
! self.lineno = self.lineno + res.group(0).count('\n')
continue
res = entityref.match(rawdata, i)
***************
*** 371,375 ****
name = res.group('name')
if self.__map_case:
! name = string.lower(name)
if self.entitydefs.has_key(name):
self.rawdata = rawdata = rawdata[:res.start(0)] + self.entitydefs[name] + rawdata[i:]
--- 371,375 ----
name = res.group('name')
if self.__map_case:
! name = name.lower()
if self.entitydefs.has_key(name):
self.rawdata = rawdata = rawdata[:res.start(0)] + self.entitydefs[name] + rawdata[i:]
***************
*** 378,382 ****
else:
self.unknown_entityref(name)
! self.lineno = self.lineno + string.count(res.group(0), '\n')
continue
elif rawdata[i] == ']':
--- 378,382 ----
else:
self.unknown_entityref(name)
! self.lineno = self.lineno + res.group(0).count('\n')
continue
elif rawdata[i] == ']':
***************
*** 407,411 ****
self.syntax_error('illegal character in content')
self.handle_data(data)
! self.lineno = self.lineno + string.count(data, '\n')
self.rawdata = rawdata[i+1:]
return self.goahead(end)
--- 407,411 ----
self.syntax_error('illegal character in content')
self.handle_data(data)
! self.lineno = self.lineno + data.count('\n')
self.rawdata = rawdata[i+1:]
return self.goahead(end)
***************
*** 443,451 ****
name = res.group('name')
if self.__map_case:
! name = string.lower(name)
pubid, syslit = res.group('pubid', 'syslit')
if pubid is not None:
pubid = pubid[1:-1] # remove quotes
! pubid = string.join(string.split(pubid)) # normalize
if syslit is not None: syslit = syslit[1:-1] # remove quotes
j = k = res.end(0)
--- 443,451 ----
name = res.group('name')
if self.__map_case:
! name = name.lower()
pubid, syslit = res.group('pubid', 'syslit')
if pubid is not None:
pubid = pubid[1:-1] # remove quotes
! pubid = ' '.join(pubid.split()) # normalize
if syslit is not None: syslit = syslit[1:-1] # remove quotes
j = k = res.end(0)
***************
*** 517,521 ****
name = res.group(0)
if self.__map_case:
! name = string.lower(name)
if name == 'xml:namespace':
self.syntax_error('old-fashioned namespace declaration')
--- 517,521 ----
name = res.group(0)
if self.__map_case:
! name = name.lower()
if name == 'xml:namespace':
self.syntax_error('old-fashioned namespace declaration')
***************
*** 542,546 ****
self.__namespaces[prefix] = attrdict['ns']
else:
! if string.lower(name) == 'xml':
self.syntax_error('illegal processing instruction target name')
self.handle_proc(name, rawdata[k:j])
--- 542,546 ----
self.__namespaces[prefix] = attrdict['ns']
else:
! if name.lower() == 'xml':
self.syntax_error('illegal processing instruction target name')
self.handle_proc(name, rawdata[k:j])
***************
*** 558,562 ****
attrname, attrvalue = res.group('name', 'value')
if self.__map_case:
! attrname = string.lower(attrname)
i = res.end(0)
if attrvalue is None:
--- 558,562 ----
attrname, attrvalue = res.group('name', 'value')
if self.__map_case:
! attrname = attrname.lower()
i = res.end(0)
if attrvalue is None:
***************
*** 580,584 ****
if attrdict.has_key(attrname):
self.syntax_error("attribute `%s' specified twice" % attrname)
! attrvalue = string.translate(attrvalue, attrtrans)
attrdict[attrname] = self.translate_references(attrvalue)
return attrdict, namespace, i
--- 580,584 ----
if attrdict.has_key(attrname):
self.syntax_error("attribute `%s' specified twice" % attrname)
! attrvalue = attrvalue.translate(attrtrans)
attrdict[attrname] = self.translate_references(attrvalue)
return attrdict, namespace, i
***************
*** 597,601 ****
nstag = tagname = tag.group('tagname')
if self.__map_case:
! nstag = tagname = string.lower(nstag)
if not self.__seen_starttag and self.__seen_doctype and \
tagname != self.__seen_doctype:
--- 597,601 ----
nstag = tagname = tag.group('tagname')
if self.__map_case:
! nstag = tagname = nstag.lower()
if not self.__seen_starttag and self.__seen_doctype and \
tagname != self.__seen_doctype:
***************
*** 637,641 ****
aprefix, key = res.group('prefix', 'local')
if self.__map_case:
! key = string.lower(key)
if aprefix is None:
aprefix = ''
--- 637,641 ----
aprefix, key = res.group('prefix', 'local')
if self.__map_case:
! key = key.lower()
if aprefix is None:
aprefix = ''
***************
*** 687,691 ****
tag = res.group(0)
if self.__map_case:
! tag = string.lower(tag)
if self.literal:
if not self.stack or tag != self.stack[-1][0]:
--- 687,691 ----
tag = res.group(0)
if self.__map_case:
! tag = tag.lower()
if self.literal:
if not self.stack or tag != self.stack[-1][0]:
***************
*** 755,762 ****
try:
if name[0] == 'x':
! n = string.atoi(name[1:], 16)
else:
! n = string.atoi(name)
! except string.atoi_error:
self.unknown_charref(name)
return
--- 755,762 ----
try:
if name[0] == 'x':
! n = int(name[1:], 16)
else:
! n = int(name)
! except ValueError:
self.unknown_charref(name)
return