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 72795be98a36548d256a24ea96d5db93c114fcb6..5ac2a47681498141b81e8cf5ccc9bbc5ac83e5f6 100644 (file)
--- 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 = "<?xml version\xc2\x85='1.0'?>\r\n"