From: Fred Drake <fdrake@acm.org>
Date: Fri, 16 Feb 2001 20:46:26 +0000 (+0000)
Subject: Remove the old version of my_StartElementHandler().  This was conditionally
X-Git-Tag: v2.1b1~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bfa31c5a0077ebf67746da69444123f2825221d;p=python

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.
---

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index b4634c82c4..4f773517f8 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -497,23 +497,6 @@ my_##NAME##Handler PARAMS {\
 			rc = PyInt_AsLong(rv);, rc, \
 	(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), 
              ("(O&)", STRING_CONV_FUNC, name))