From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Tue, 1 Nov 2011 22:54:16 +0000 (+0100)
Subject: Fix merge in changeset e1dde980a92c.
X-Git-Tag: v2.7.3rc1~335
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b82cbc33f5f7997b181278f2ef20691e11099d2b;p=python

Fix merge in changeset e1dde980a92c.
---

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 1b66a8988f..f1a774ae94 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -738,8 +738,8 @@ def iterparse():
     ...     print action, elem.tag
     ... except ET.ParseError, v:
     ...   print v
-    junk after document element: line 1, column 12
     end document
+    junk after document element: line 1, column 12
     """
 
 def writefile():