diff options
| author | Fred Drake <fdrake@acm.org> | 2001-02-16 20:46:26 (GMT) |
|---|---|---|
| committer | Fred Drake <fdrake@acm.org> | 2001-02-16 20:46:26 (GMT) |
| commit | 6bfa31c5a0077ebf67746da69444123f2825221d (patch) | |
| tree | 9b10bd1d9c74fab11c0d3d9ebf2d45947b9da1a5 | |
| parent | fc93b0a81a93a6b0960a8a08a565cce88a0d8f61 (diff) | |
| download | cpython-6bfa31c5a0077ebf67746da69444123f2825221d.zip cpython-6bfa31c5a0077ebf67746da69444123f2825221d.tar.gz cpython-6bfa31c5a0077ebf67746da69444123f2825221d.tar.bz2 | |
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.
| -rw-r--r-- | Modules/pyexpat.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index b4634c8..4f77351 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)) |