[Python-checkins] python/dist/src/Lib/xml/sax expatreader.py,1.28,1.29
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Sun, 30 Jun 2002 00:21:26 -0700
Update of /cvsroot/python/python/dist/src/Lib/xml/sax
In directory usw-pr-cvs1:/tmp/cvs-serv1234
Modified Files:
expatreader.py
Log Message:
Merge changes from PyXML:
[1.15]
Added understanding of the feature_validation, feature_external_pes,
and feature_string_interning features.
Added support for the feature_external_ges feature.
Added support for the property_xml_string property.
[1.16]
Made it recognize the namespace prefixes feature.
[1.17]
removed erroneous first line
[1.19]
Support optional string interning in pyexpat.
[1.21]
Restore compatibility with versions of Python that did not support weak
references. These do not get the cyclic reference fix, but they will
continue to work as they did before.
[1.22]
Activate entity processing unless standalone.
Index: expatreader.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/sax/expatreader.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** expatreader.py 31 May 2002 20:46:39 -0000 1.28
--- expatreader.py 30 Jun 2002 07:21:24 -0000 1.29
***************
*** 7,10 ****
--- 7,15 ----
from xml.sax._exceptions import *
+ from xml.sax.handler import feature_validation, feature_namespaces
+ from xml.sax.handler import feature_namespace_prefixes
+ from xml.sax.handler import feature_external_ges, feature_external_pes
+ from xml.sax.handler import feature_string_interning
+ from xml.sax.handler import property_xml_string, property_interning_dict
# xml.parsers.expat does not raise ImportError in Jython
***************
*** 26,30 ****
AttributesNSImpl = xmlreader.AttributesNSImpl
! import weakref
# --- ExpatLocator
--- 31,46 ----
AttributesNSImpl = xmlreader.AttributesNSImpl
! # If we're using a sufficiently recent version of Python, we can use
! # weak references to avoid cycles between the parser and content
! # handler, otherwise we'll just have to pretend.
! try:
! import _weakref
! except ImportError:
! def _mkproxy(o):
! return o
! else:
! import weakref
! _mkproxy = weakref.proxy
! del weakref, _weakref
# --- ExpatLocator
***************
*** 37,56 ****
"""
def __init__(self, parser):
! self._ref = weakref.ref(parser)
def getColumnNumber(self):
! parser = self._ref()
! if parser is None or parser._parser is None:
return None
return parser._parser.ErrorColumnNumber
def getLineNumber(self):
! parser = self._ref()
! if parser is None or parser._parser is None:
return 1
return parser._parser.ErrorLineNumber
def getPublicId(self):
! parser = self._ref()
if parser is None:
return None
--- 53,72 ----
"""
def __init__(self, parser):
! self._ref = _mkproxy(parser)
def getColumnNumber(self):
! parser = self._ref
! if parser._parser is None:
return None
return parser._parser.ErrorColumnNumber
def getLineNumber(self):
! parser = self._ref
! if parser._parser is None:
return 1
return parser._parser.ErrorLineNumber
def getPublicId(self):
! parser = self._ref
if parser is None:
return None
***************
*** 58,62 ****
def getSystemId(self):
! parser = self._ref()
if parser is None:
return None
--- 74,78 ----
def getSystemId(self):
! parser = self._ref
if parser is None:
return None
***************
*** 77,80 ****
--- 93,98 ----
self._parsing = 0
self._entity_stack = []
+ self._external_ges = 1
+ self._interning = None
# XMLReader methods
***************
*** 101,106 ****
def getFeature(self, name):
! if name == handler.feature_namespaces:
return self._namespaces
raise SAXNotRecognizedException("Feature '%s' not recognized" % name)
--- 119,131 ----
def getFeature(self, name):
! if name == feature_namespaces:
return self._namespaces
+ elif name == feature_string_interning:
+ return self._interning is not None
+ elif name in (feature_validation, feature_external_pes,
+ feature_namespace_prefixes):
+ return 0
+ elif name == feature_external_ges:
+ return self._external_ges
raise SAXNotRecognizedException("Feature '%s' not recognized" % name)
***************
*** 108,113 ****
if self._parsing:
raise SAXNotSupportedException("Cannot set features while parsing")
! if name == handler.feature_namespaces:
self._namespaces = state
else:
raise SAXNotRecognizedException("Feature '%s' not recognized" %
--- 133,156 ----
if self._parsing:
raise SAXNotSupportedException("Cannot set features while parsing")
!
! if name == feature_namespaces:
self._namespaces = state
+ elif name == feature_external_ges:
+ self._external_ges = state
+ elif name == feature_string_interning:
+ if state:
+ if self._interning is None:
+ self._interning = {}
+ else:
+ self._interning = None
+ elif name == feature_validation:
+ if state:
+ raise SAXNotSupportedException("expat does not support validation")
+ elif name == feature_external_pes:
+ if state:
+ raise SAXNotSupportedException("expat does not read external parameter entities")
+ elif name == feature_namespace_prefixes:
+ if state:
+ raise SAXNotSupportedException("expat does not report namespace prefixes")
else:
raise SAXNotRecognizedException("Feature '%s' not recognized" %
***************
*** 117,120 ****
--- 160,173 ----
if name == handler.property_lexical_handler:
return self._lex_handler_prop
+ elif name == property_interning_dict:
+ return self._interning
+ elif name == property_xml_string:
+ if self._parser:
+ if hasattr(self._parser, "GetInputContext"):
+ return self._parser.GetInputContext()
+ else:
+ raise SAXNotRecognizedException("This version of expat does not support getting the XML string")
+ else:
+ raise SAXNotSupportedException("XML string cannot be returned when not parsing")
raise SAXNotRecognizedException("Property '%s' not recognized" % name)
***************
*** 124,129 ****
if self._parsing:
self._reset_lex_handler_prop()
else:
! raise SAXNotRecognizedException("Property '%s' not recognized" % name)
# IncrementalParser methods
--- 177,188 ----
if self._parsing:
self._reset_lex_handler_prop()
+ elif name == property_interning_dict:
+ self._interning = value
+ elif name == property_xml_string:
+ raise SAXNotSupportedException("Property '%s' cannot be set" %
+ name)
else:
! raise SAXNotRecognizedException("Property '%s' not recognized" %
! name)
# IncrementalParser methods
***************
*** 169,177 ****
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
--- 228,236 ----
def reset(self):
if self._namespaces:
! self._parser = expat.ParserCreate(None, " ", intern = self._interning)
self._parser.StartElementHandler = self.start_element_ns
self._parser.EndElementHandler = self.end_element_ns
else:
! self._parser = expat.ParserCreate(intern = self._interning)
self._parser.StartElementHandler = self.start_element
self._parser.EndElementHandler = self.end_element
***************
*** 190,193 ****
--- 249,253 ----
# self._parser.NotStandaloneHandler =
self._parser.ExternalEntityRefHandler = self.external_entity_ref
+ self._parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE)
self._parsing = 0
***************
*** 269,272 ****
--- 329,335 ----
def external_entity_ref(self, context, base, sysid, pubid):
+ if not self._external_ges:
+ return 1
+
source = self._ent_handler.resolveEntity(pubid, sysid)
source = saxutils.prepare_input_source(source,