[Python-checkins] cpython (2.7): Fix merge in changeset e1dde980a92c.

[florent.xicluna]

http://hg.python.org/cpython/rev/fd4236c787cb
changeset:   73296:fd4236c787cb
branch:      2.7
user:        Florent Xicluna <florent.xicluna at gmail.com>
date:        Tue Nov 01 23:54:16 2011 +0100
summary:
  Fix merge in changeset e1dde980a92c.

files:
  Lib/test/test_xml_etree.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


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

-- 
Repository URL: http://hg.python.org/cpython