Ticket #110: eof_newline.patch

output.py

@@ -181 +189 @@
     _PRESERVE_SPACE = frozenset()
 
     def __init__(self, doctype=None, strip_whitespace=True,
-                 namespace_prefixes=None, cache=True):
+                 namespace_prefixes=None, cache=True, 
+                 append_new_line_at_eof=False):
         """Initialize the XML serializer.
         
         :param doctype: a ``(name, pubid, sysid)`` tuple that represents the
@@ -203 +212 @@
         if doctype:
             self.filters.append(DocTypeInserter(doctype))
         self.cache = cache
+        self.append_new_line_at_eof = append_new_line_at_eof
 
     def __call__(self, stream):
         have_decl = have_doctype = False
@@ -281 +291 @@
             elif kind is PI:
                 yield _emit(kind, data, Markup('<?%s %s?>' % data))
 
+        if self.append_new_line_at_eof:
+            yield unicode('\n')
 
+
 class XHTMLSerializer(XMLSerializer):
     """Produces XHTML text from an event stream.
     
@@ -303 +316 @@
     ])
 
     def __init__(self, doctype=None, strip_whitespace=True,
-                 namespace_prefixes=None, drop_xml_decl=True, cache=True):
+                 namespace_prefixes=None, drop_xml_decl=True, cache=True,
+                 append_new_line_at_eof=False):
         super(XHTMLSerializer, self).__init__(doctype, False)
         self.filters = [EmptyTagFilter()]
         if strip_whitespace:
@@ -316 +330 @@
             self.filters.append(DocTypeInserter(doctype))
         self.drop_xml_decl = drop_xml_decl
         self.cache = cache
+        self.append_new_line_at_eof = append_new_line_at_eof
 
     def __call__(self, stream):
         boolean_attrs = self._BOOLEAN_ATTRS
@@ -409 +424 @@
             elif kind is PI:
                 yield _emit(kind, data, Markup('<?%s %s?>' % data))
 
+        if self.append_new_line_at_eof:
+            yield unicode('\n')
 
+
 class HTMLSerializer(XHTMLSerializer):
     """Produces HTML text from an event stream.
     
@@ -424 +442 @@
         QName('style'), QName('http://www.w3.org/1999/xhtml}style')
     ])
 
-    def __init__(self, doctype=None, strip_whitespace=True, cache=True):
+    def __init__(self, doctype=None, strip_whitespace=True, cache=True, append_new_line_at_eof=False):
         """Initialize the HTML serializer.
         
         :param doctype: a ``(name, pubid, sysid)`` tuple that represents the
@@ -447 +465 @@
         if doctype:
             self.filters.append(DocTypeInserter(doctype))
         self.cache = True
+        self.append_new_line_at_eof = append_new_line_at_eof
 
     def __call__(self, stream):
         boolean_attrs = self._BOOLEAN_ATTRS
@@ -526 +545 @@
             elif kind is PI:
                 yield _emit(kind, data, Markup('<?%s %s?>' % data))
 
+        if self.append_new_line_at_eof:
+            yield unicode('\n')
 
+
 class TextSerializer(object):
     """Produces plain text from an event stream.
     
@@ -556 +578 @@
     Hello & Bye!
     """
 
-    def __init__(self, strip_markup=False):
+    def __init__(self, strip_markup=False, append_new_line_at_eof=False):
         """Create the serializer.
         
         :param strip_markup: whether markup (tags and encoded characters) found
                              in the text should be removed
         """
         self.strip_markup = strip_markup
+        self.append_new_line_at_eof = append_new_line_at_eof
 
     def __call__(self, stream):
         strip_markup = self.strip_markup
@@ -573 +596 @@
                     data = data.striptags().stripentities()
                 yield unicode(data)
 
+        if self.append_new_line_at_eof:
+            yield unicode('\n')
 
+
 class EmptyTagFilter(object):
     """Combines `START` and `STOP` events into `EMPTY` events for elements that
     have no contents.