Ticket #5411: atom-config.diff

django/utils/feedgenerator.py

@@ -203 +203 @@
     # Spec: http://atompub.org/2005/07/11/draft-ietf-atompub-format-10.html
     mime_type = 'application/atom+xml'
     ns = u"http://www.w3.org/2005/Atom"
+    title_type = u'text'
+    summary_type = u'html'
     def write(self, outfile, encoding):
         handler = SimplerXMLGenerator(outfile, encoding)
         handler.startDocument()
@@ -210 +212 @@
             handler.startElement(u"feed", {u"xmlns": self.ns, u"xml:lang": self.feed['language']})
         else:
             handler.startElement(u"feed", {u"xmlns": self.ns})
-        handler.addQuickElement(u"title", self.feed['title'])
+        handler.addQuickElement(u"title", self.feed['title'],
+                                {u'type': self.title_type})
         handler.addQuickElement(u"link", "", {u"rel": u"alternate", u"href": self.feed['link']})
         if self.feed['feed_url'] is not None:
             handler.addQuickElement(u"link", "", {u"rel": u"self", u"href": self.feed['feed_url']})
@@ -225 +228 @@
                 handler.addQuickElement(u"uri", self.feed['author_link'])
             handler.endElement(u"author")
         if self.feed['subtitle'] is not None:
-            handler.addQuickElement(u"subtitle", self.feed['subtitle'])
+            handler.addQuickElement(u"subtitle", self.feed['subtitle'],
+                                    {u'type': self.title_type})
         for cat in self.feed['categories']:
             handler.addQuickElement(u"category", "", {u"term": cat})
         if self.feed['feed_copyright'] is not None:
@@ -236 +240 @@
     def write_items(self, handler):
         for item in self.items:
             handler.startElement(u"entry", {})
-            handler.addQuickElement(u"title", item['title'])
+            handler.addQuickElement(u"title", item['title'],
+                                    {u'type': self.title_type})
             handler.addQuickElement(u"link", u"", {u"href": item['link'], u"rel": u"alternate"})
             if item['pubdate'] is not None:
                 handler.addQuickElement(u"updated", rfc3339_date(item['pubdate']).decode('ascii'))
@@ -260 +265 @@
 
             # Summary.
             if item['description'] is not None:
-                handler.addQuickElement(u"summary", item['description'], {u"type": u"html"})
+                handler.addQuickElement(u"summary", item['description'],
+                                        {u'type': self.summary_type})
 
             # Enclosure.
             if item['enclosure'] is not None: