--- pysrc/orig/Lib/xml/etree/ElementTree.py	Fri Mar 23 20:28:01 2012
+++ pysrc/mod/Lib/xml/etree/ElementTree.py	Fri Mar 23 20:28:01 2012
@@ -813,7 +813,8 @@
               encoding=None,
               xml_declaration=None,
               default_namespace=None,
-              method=None):
+              method=None,
+              use_long_xml_tags=None):
         # assert self._root is not None
         if not method:
             method = "xml"
@@ -859,7 +860,7 @@
         else:
             qnames, namespaces = _namespaces(self._root, default_namespace)
             serialize = _serialize[method]
-            serialize(write, self._root, qnames, namespaces)
+            serialize(write, self._root, qnames, namespaces, bool(use_long_xml_tags))
         if file_or_filename is not file:
             file.close()
 
@@ -935,7 +936,7 @@
             add_qname(text.text)
     return qnames, namespaces
 
-def _serialize_xml(write, elem, qnames, namespaces):
+def _serialize_xml(write, elem, qnames, namespaces, long_xml):
     tag = elem.tag
     text = elem.text
     if tag is Comment:
@@ -948,7 +949,7 @@
             if text:
                 write(_escape_cdata(text))
             for e in elem:
-                _serialize_xml(write, e, qnames, None)
+                _serialize_xml(write, e, qnames, None, long_xml)
         else:
             write("<" + tag)
             items = list(elem.items())
@@ -970,12 +971,12 @@
                     else:
                         v = _escape_attrib(v)
                     write(" %s=\"%s\"" % (qnames[k], v))
-            if text or len(elem):
+            if text or len(elem) or long_xml:
                 write(">")
                 if text:
                     write(_escape_cdata(text))
                 for e in elem:
-                    _serialize_xml(write, e, qnames, None)
+                    _serialize_xml(write, e, qnames, None, long_xml)
                 write("</" + tag + ">")
             else:
                 write(" />")
@@ -990,7 +991,7 @@
 except NameError:
     pass
 
-def _serialize_html(write, elem, qnames, namespaces):
+def _serialize_html(write, elem, qnames, namespaces, long_xml):
     tag = elem.tag
     text = elem.text
     if tag is Comment:
@@ -1003,7 +1004,7 @@
             if text:
                 write(_escape_cdata(text))
             for e in elem:
-                _serialize_html(write, e, qnames, None)
+                _serialize_html(write, e, qnames, None, long_xml)
         else:
             write("<" + tag)
             items = list(elem.items())
@@ -1034,7 +1035,7 @@
                 else:
                     write(_escape_cdata(text))
             for e in elem:
-                _serialize_html(write, e, qnames, None)
+                _serialize_html(write, e, qnames, None, long_xml)
             if tag not in HTML_EMPTY:
                 write("</" + tag + ">")
     if elem.tail: