Synchronize with PyXML 1.79:
73: Restore support for Python 2.1.
74: Factor the previous change differently
79: Conditionalize usage of PyTuple_Pack.
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index d5929b6..d359a74 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -338,7 +338,11 @@
value = Py_None;
Py_INCREF(value);
}
+#if PY_VERSION_HEX < 0x02040000
+ arg = Py_BuildValue("(OOO)", type, value, traceback);
+#else
arg = PyTuple_Pack(3, type, value, traceback);
+#endif
if (arg == NULL) {
PyErr_Restore(type, value, traceback);
return 0;
@@ -936,7 +940,12 @@
PyTuple_SET_ITEM(arg, 0, bytes);
- if ((str = PyObject_Call(meth, arg, NULL)) == NULL)
+#if PY_VERSION_HEX < 0x02020000
+ str = PyObject_CallObject(meth, arg);
+#else
+ str = PyObject_Call(meth, arg, NULL);
+#endif
+ if (str == NULL)
goto finally;
/* XXX what to do if it returns a Unicode string? */