From: Ezio Melotti Date: Fri, 22 Jan 2010 17:52:26 +0000 (+0000) Subject: Merged revisions 77700 via svnmerge from X-Git-Tag: v3.1.2rc1~150 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27b11f730e53ff5946d1a94e126f5d62e913119e;p=python 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. ........ ................ --- diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py index 72795be98a..5ac2a47681 100644 --- a/Lib/test/test_pyexpat.py +++ b/Lib/test/test_pyexpat.py @@ -518,7 +518,7 @@ class MalformedInputText(unittest.TestCase): 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 = "\r\n"