[Python-checkins] CVS: python/dist/src/Modules pyexpat.c,2.40,2.41

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv14111

Modified Files:
	pyexpat.c 
Log Message:

Remove the old version of my_StartElementHandler().  This was conditionally
compiled only for some versions of Expat, but was no longer needed as the
new implementation works for all versions.  Keeping it created multiple
definitions for Expat 1.2, which caused compilation to fail.


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v
retrieving revision 2.40
retrieving revision 2.41
diff -C2 -r2.40 -r2.41
*** pyexpat.c	2001/02/14 18:29:45	2.40
--- pyexpat.c	2001/02/16 20:46:26	2.41
***************
*** 498,518 ****
  	(xmlparseobject *)userData)
  
- #if EXPAT_VERSION == 0x010200
- #if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6
- VOID_HANDLER(StartElement,
-              (void *userData, const XML_Char *name, const XML_Char **atts), 
-              ("(O&O&)", STRING_CONV_FUNC, name, 
-               conv_atts_using_string, atts))
- #else
- /* Python 1.6 and later */
- VOID_HANDLER(StartElement,
-              (void *userData, const XML_Char *name, const XML_Char **atts), 
-              ("(O&O&)", STRING_CONV_FUNC, name, 
-               (self->returns_unicode  
-                ? conv_atts_using_unicode 
-                : conv_atts_using_string), atts))
- #endif
- #endif
- 
  VOID_HANDLER(EndElement, 
               (void *userData, const XML_Char *name), 
--- 498,501 ----