Ticket #3958: feedgenerator.3.diff

utils/feedgenerator.py

@@ -132 +132 @@
             handler.addQuickElement(u"category", cat)
         if self.feed['feed_copyright'] is not None:
             handler.addQuickElement(u"copyright", self.feed['feed_copyright'])
+        handler.addQuickElement(u"lastBuildDate", rfc2822_date(self.latest_post_date()).decode('ascii'))
         self.write_items(handler)
         self.endChannelElement(handler)
         handler.endElement(u"rss")
@@ -199 +200 @@
         else:
             handler.startElement(u"feed", {u"xmlns": self.ns})
         handler.addQuickElement(u"title", self.feed['title'])
+        if self.feed['subtitle'] is not None or self.feed['description'] is not None:
+            handler.addQuickElement(u"subtitle", self.feed['subtitle'] or self.feed['description'])
         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']})
@@ -212 +215 @@
             if self.feed['author_link'] is not None:
                 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'])
         for cat in self.feed['categories']:
             handler.addQuickElement(u"category", "", {u"term": cat})
         if self.feed['feed_copyright'] is not None: