[Python-checkins] CVS: python/dist/src/Lib/xml/sax expatreader.py,1.1,1.2

[Paul Prescod]

Update of /cvsroot/python/python/dist/src/Lib/xml/sax
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21106/sax

Modified Files:
	expatreader.py 
Log Message:
Used original SAX handling form.


Index: expatreader.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/xml/sax/expatreader.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** expatreader.py	2000/06/29 19:34:54	1.1
--- expatreader.py	2000/07/04 03:39:33	1.2
***************
*** 102,107 ****
          else:
              self._parser = pyexpat.ParserCreate()
!             self._parser.StartElementHandler = self._cont_handler.startElement
!             self._parser.EndElementHandler = self._cont_handler.endElement
  
          self._parser.ProcessingInstructionHandler = \
--- 102,107 ----
          else:
              self._parser = pyexpat.ParserCreate()
!             self._parser.StartElementHandler = self.start_element
!             self._parser.EndElementHandler = self.end_element
  
          self._parser.ProcessingInstructionHandler = \
***************
*** 134,156 ****
          return self._parser.GetBase()
      
-     # internal methods
- 
      # event handlers
- 
      def start_element(self, name, attrs):
!         self._cont_handler.startElement(name, 
                                   xmlreader.AttributesImpl(attrs, attrs))
  
      def end_element(self, name):
!         self._cont_handler.endElement(name)
  
      def start_element_ns(self, name, attrs):
          pair = split(name)
          if len(pair) == 1:
!             tup = (None, name, None)
          else:
!             tup = pair+[None] # prefix is not implemented yet!
  
!         self._cont_handler.startElement(tup,
                                          xmlreader.AttributesImpl(attrs, None))        
  
--- 134,153 ----
          return self._parser.GetBase()
      
      # event handlers
      def start_element(self, name, attrs):
!         self._cont_handler.startElement(name, name,
                                   xmlreader.AttributesImpl(attrs, attrs))
  
      def end_element(self, name):
!         self._cont_handler.endElement( name, name )
  
      def start_element_ns(self, name, attrs):
          pair = split(name)
          if len(pair) == 1:
!             tup = (None, name )
          else:
!             tup = pair
  
!         self._cont_handler.startElement(tup, None,
                                          xmlreader.AttributesImpl(attrs, None))        
  
***************
*** 162,170 ****
              name = pair+[None] # prefix is not implemented yet!
              
!         self._cont_handler.endElement(name)
  
      def processing_instruction(self, target, data):
          self._cont_handler.processingInstruction(target, data)
  
      def character_data(self, data):
          self._cont_handler.characters(data)
--- 159,169 ----
              name = pair+[None] # prefix is not implemented yet!
              
!         self._cont_handler.endElement(name, None)
  
+     # this is not used
      def processing_instruction(self, target, data):
          self._cont_handler.processingInstruction(target, data)
  
+     # this is not used
      def character_data(self, data):
          self._cont_handler.characters(data)