From: Eli Bendersky <eliben@gmail.com>
Date: Tue, 17 Jul 2012 02:45:11 +0000 (+0300)
Subject: Preserve the invariant tostring(elem) == b''.join(tostringlist(elem)) and add a test... 
X-Git-Tag: v3.3.0b2~180
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=426e248febc4b86ea4512baaaa81966ab54c83da;p=python

Preserve the invariant tostring(elem) == b''.join(tostringlist(elem)) and add a test to make sure it keeps working
---

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index d90f9780c5..da1ad09686 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -2286,6 +2286,15 @@ class IOTest(unittest.TestCase):
                 '''<?xml version='1.0' encoding='utf-16'?>\n'''
                 '''<site />'''.encode("utf-16"))
 
+    def test_tostringlist_invariant(self):
+        root = ET.fromstring('<tag>foo</tag>')
+        self.assertEqual(
+            ET.tostring(root, 'unicode'),
+            ''.join(ET.tostringlist(root, 'unicode')))
+        self.assertEqual(
+            ET.tostring(root, 'utf-16'),
+            b''.join(ET.tostringlist(root, 'utf-16')))
+
 
 class ParseErrorTest(unittest.TestCase):
     def test_subclass(self):
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index 10bf84992e..3981659dd9 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -1190,9 +1190,15 @@ def tostringlist(element, encoding=None, method=None):
         def writable(self):
             return True
 
+        def seekable(self):
+            return True
+
         def write(self, b):
             data.append(b)
 
+        def tell(self):
+            return len(data)
+
     ElementTree(element).write(DataStream(), encoding, method=method)
     return data