summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-01-22 17:52:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-01-22 17:52:26 (GMT)
commit27b11f730e53ff5946d1a94e126f5d62e913119e (patch)
tree128588a103acbbad317b63383f1ab45871cd726a
parent865e33bb3df3376577db51a8c9392a9d385924fd (diff)
downloadcpython-27b11f730e53ff5946d1a94e126f5d62e913119e.zip
cpython-27b11f730e53ff5946d1a94e126f5d62e913119e.tar.gz
cpython-27b11f730e53ff5946d1a94e126f5d62e913119e.tar.bz2
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. ........ ................
-rw-r--r--Lib/test/test_pyexpat.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
index 72795be..5ac2a47 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 = "<?xml version\xc2\x85='1.0'?>\r\n"