[Python-checkins] CVS: python/dist/src/Lib/xml/sax expatreader.py,1.3,1.4
Fred L. Drake
python-dev@python.org
Fri, 22 Sep 2000 21:49:33 -0700
Update of /cvsroot/python/python/dist/src/Lib/xml/sax
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19603/sax
Modified Files:
expatreader.py
Log Message:
Use the public name for the Expat parser; "pyexpat" is deprecated.
Index: expatreader.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/sax/expatreader.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** expatreader.py 2000/07/06 02:56:36 1.3
--- expatreader.py 2000/09/23 04:49:30 1.4
***************
*** 2,7 ****
SAX driver for the Pyexpat C module. This driver works with
pyexpat.__version__ == '1.5'.
-
- $Id$
"""
--- 2,5 ----
***************
*** 18,26 ****
version = "0.20"
-
- from string import split
from xml.sax import xmlreader
- import pyexpat
import xml.sax
--- 16,22 ----
version = "0.20"
+ from xml.parsers import expat
from xml.sax import xmlreader
import xml.sax
***************
*** 50,56 ****
try:
xmlreader.IncrementalParser.parse(self, stream)
! except pyexpat.error:
error_code = self._parser.ErrorCode
! raise xml.sax.SAXParseException(pyexpat.ErrorString(error_code),
None, self)
--- 46,52 ----
try:
xmlreader.IncrementalParser.parse(self, stream)
! except expat.error:
error_code = self._parser.ErrorCode
! raise xml.sax.SAXParseException(expat.ErrorString(error_code),
None, self)
***************
*** 97,105 ****
def reset(self):
if self._namespaces:
! self._parser = pyexpat.ParserCreate(None, " ")
self._parser.StartElementHandler = self.start_element_ns
self._parser.EndElementHandler = self.end_element_ns
else:
! self._parser = pyexpat.ParserCreate()
self._parser.StartElementHandler = self.start_element
self._parser.EndElementHandler = self.end_element
--- 93,101 ----
def reset(self):
if self._namespaces:
! self._parser = expat.ParserCreate(None, " ")
self._parser.StartElementHandler = self.start_element_ns
self._parser.EndElementHandler = self.end_element_ns
else:
! self._parser = expat.ParserCreate()
self._parser.StartElementHandler = self.start_element
self._parser.EndElementHandler = self.end_element
***************
*** 143,147 ****
def start_element_ns(self, name, attrs):
! pair = split(name)
if len(pair) == 1:
tup = (None, name )
--- 139,143 ----
def start_element_ns(self, name, attrs):
! pair = name.split()
if len(pair) == 1:
tup = (None, name )
***************
*** 153,157 ****
def end_element_ns(self, name):
! pair = split(name)
if len(pair) == 1:
name = (None, name, None)
--- 149,153 ----
def end_element_ns(self, name):
! pair = name.split()
if len(pair) == 1:
name = (None, name, None)