Be more flexible about which versions of Expat / pyexpat are supported.

I *think* this fixes the misleading test failure on Windows Python 2.1.*.

lib/python/TAL/tests/test_xmlparser.py

@@ -92,7 +92,10 @@ class XMLParserTestCase(unittest.TestCase):
             parser.parseStream(SegmentedFile(source))
         else:
             parser.parseString(source)
-        self.assertEquals(parser.get_events(),events)
+        if utils.oldexpat:
+            while events[0][0] in ('decl', 'doctype'):
+                del events[0]
+        self.assertEquals(parser.get_events(), events)
 
     def _run_check_extra(self, source, events):
         self._run_check(source, events, EventCollectorExtra)

lib/python/TAL/tests/utils.py

@@ -13,6 +13,7 @@ import unittest
 
 
 # Set skipxml to true if an XML parser could not be found.
+pyexpat = None
 skipxml = 0
 try:
     import pyexpat
@@ -22,6 +23,23 @@ except ImportError:
         import xml.parsers.pyexpat
     except ImportError:
         skipxml = 1
+    else:
+        pyexpat = xml.parsers.pyexpat
+
+
+# Set oldexpat if the StartDoctypeDeclHandler and XmlDeclHandler are
+# not supported.  The tests need to know whether the events reported
+# by those handlers should be expected, but need to make sure the
+# right thing is returned if they are.
+oldexpat = 0
+if pyexpat is not None:
+    p = pyexpat.ParserCreate()
+    # Can't use hasattr() since pyexpat supports the handler
+    # attributes in a broken way.
+    try:
+        p.StartDoctypeDeclHandler = None
+    except AttributeError:
+        oldexpat = 1
 
 
 def run_suite(suite, outf=None, errf=None):