Ticket #1028: feedgenerator_patch.diff

feedgenerator.py

@@ -55 +55 @@
 
 class SyndicationFeed(object):
     "Base class for all syndication feeds. Subclasses should provide write()"
-    def __init__(self, title, link, description, language=None, author_email=None,
-            author_name=None, author_link=None, subtitle=None, categories=None,
-            feed_url=None, feed_copyright=None, feed_guid=None, ttl=None, **kwargs):
+    def __init__(self, title, link, description, language=None, managing_editor=None,
+                 webmaster=None, stylesheet=None, generator=None, image=None,
+                 cloud=None, skip_hours=None, skip_days=None, author_email=None,
+                 author_name=None, author_link=None, subtitle=None, categories=None,
+                 feed_url=None, feed_copyright=None, feed_guid=None, ttl=None,
+                 icon=None, **kwargs):
         to_unicode = lambda s: force_unicode(s, strings_only=True)
         if categories:
             categories = [force_unicode(c) for c in categories]
+        if cloud:
+            cloud = dict([(force_unicode(k),force_unicode(v)) for k,v in cloud.items()])
         self.feed = {
             'title': to_unicode(title),
             'link': iri_to_uri(link),
             'description': to_unicode(description),
             'language': to_unicode(language),
+            'managing_editor': to_unicode(managing_editor),
+            'webmaster': to_unicode(webmaster),
+            'stylesheet': to_unicode(stylesheet),
+            'generator': to_unicode(generator),
+            'image': image,
+            'icon': icon,
+            'cloud': cloud,
+            'skip_hours': skip_hours,
+            'skip_days': skip_days,
             'author_email': to_unicode(author_email),
             'author_name': to_unicode(author_name),
             'author_link': iri_to_uri(author_link),
@@ -178 +192 @@
     def write(self, outfile, encoding):
         handler = SimplerXMLGenerator(outfile, encoding)
         handler.startDocument()
+        if self.feed['stylesheet'] is not None:
+            handler.processingInstruction(u"xml-stylesheet",
+                                      u'type="text/css" href="%s"' % self.feed['stylesheet'])
         handler.startElement(u"rss", self.rss_attributes())
         handler.startElement(u"channel", self.root_attributes())
         self.add_root_elements(handler)
@@ -198 +215 @@
         handler.addQuickElement(u"title", self.feed['title'])
         handler.addQuickElement(u"link", self.feed['link'])
         handler.addQuickElement(u"description", self.feed['description'])
+        handler.addQuickElement(u"generator", self.feed['generator'])
         if self.feed['language'] is not None:
             handler.addQuickElement(u"language", self.feed['language'])
         for cat in self.feed['categories']:
@@ -207 +225 @@
         handler.addQuickElement(u"lastBuildDate", rfc2822_date(self.latest_post_date()).decode('utf-8'))
         if self.feed['ttl'] is not None:
             handler.addQuickElement(u"ttl", self.feed['ttl'])
+        if self.feed['managing_editor'] is not None:
+            handler.addQuickElement(u"managingEditor", self.feed['managing_editor'])
+        if self.feed['webmaster'] is not None:
+            handler.addQuickElement(u"webMaster", self.feed['webmaster'])
+        if self.feed['image'] is not None:
+            handler.startElement(u"image", {})
+            for k,v in self.feed['image'].items():
+                handler.addQuickElement(force_unicode(k), force_unicode(v))
+            handler.endElement(u"image")
+        if self.feed['cloud'] is not None:
+            handler.addQuickElement(u"cloud", attrs=self.feed['cloud'])
+        if self.feed['skip_hours'] is not None:
+            handler.startElement(u"skipHours", {})
+            for h in self.feed['skip_hours']:
+                handler.addQuickElement(u"hour", force_unicode(h))
+            handler.endElement(u"skipHours")
+        if self.feed['skip_days'] is not None:
+            handler.startElement(u"skipDays", {})
+            for d in self.feed['skip_days']:
+                handler.addQuickElement(u"day", d)
+            handler.endElement(u"skipDays")
 
     def endChannelElement(self, handler):
         handler.endElement(u"channel")
@@ -264 +303 @@
     def write(self, outfile, encoding):
         handler = SimplerXMLGenerator(outfile, encoding)
         handler.startDocument()
+        if self.feed['stylesheet']:
+            handler.processingInstruction(u"xml-stylesheet",
+                                      u'type="text/css" href="%s"' % self.feed['stylesheet'])            
         handler.startElement(u'feed', self.root_attributes())
         self.add_root_elements(handler)
         self.write_items(handler)
@@ -280 +322 @@
         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']})
+        if self.feed['icon'] is not None:
+            handler.addQuickElement(u"icon",self.feed['icon'])
         handler.addQuickElement(u"id", self.feed['id'])
         handler.addQuickElement(u"updated", rfc3339_date(self.latest_post_date()).decode('utf-8'))
         if self.feed['author_name'] is not None: