Author: ezio.melotti Date: Fri Jan 22 18:52:26 2010 New Revision: 77701 Log: Merged revisions 77700 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77700 | ezio.melotti | 2010-01-22 19:36:17 +0200 (Fri, 22 Jan 2010) | 9 lines Merged revisions 77697 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77697 | ezio.melotti | 2010-01-22 18:58:28 +0200 (Fri, 22 Jan 2010) | 1 line This should fix the failure introduced in r77680. The error message is now different and it caused the test to fail. The failing test is not present in 2.5 so it is failing only on 2.6 and newer versions. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/test/test_pyexpat.py Modified: python/branches/release31-maint/Lib/test/test_pyexpat.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_pyexpat.py (original) +++ python/branches/release31-maint/Lib/test/test_pyexpat.py Fri Jan 22 18:52:26 2010 @@ -518,7 +518,7 @@ parser.Parse(xml, True) self.fail() except expat.ExpatError as e: - self.assertEquals(str(e), 'no element found: line 2, column 1') + self.assertEquals(str(e), 'unclosed token: line 2, column 0') def test2(self): xml = "<?xml version\xc2\x85='1.0'?>\r\n"