From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 22 Jan 2010 17:17:40 +0000 (+0000)
Subject: Merged revisions 77697 via svnmerge from
X-Git-Tag: v2.6.5rc1~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3254d76ccb160cf0b4d165583e314e1d188313d4;p=python

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 649d5d23bf..9ea44d7935 100644
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -567,7 +567,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"