Ticket #9800: rss-guid_is_permalink-attribute.diff

django/utils/feedgenerator.py

@@ -71 +71 @@
     "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):
+            feed_url=None, feed_copyright=None, feed_guid=None, ttl=None, guid_is_permalink=None, **kwargs):
         to_unicode = lambda s: force_unicode(s, strings_only=True)
         if categories:
             categories = [force_unicode(c) for c in categories]
@@ -92 +92 @@
             'feed_copyright': to_unicode(feed_copyright),
             'id': feed_guid or link,
             'ttl': ttl,
+            'guid_is_permalink': guid_is_permalink,
         }
         self.feed.update(kwargs)
         self.items = []
@@ -264 +265 @@
         if item['comments'] is not None:
             handler.addQuickElement(u"comments", item['comments'])
         if item['unique_id'] is not None:
-            handler.addQuickElement(u"guid", item['unique_id'])
+            guid_attrs = {}
+            if isinstance(self.feed['guid_is_permalink'], bool):
+                guid_attrs['isPermalink'] = str(self.feed['guid_is_permalink']).lower()
+            handler.addQuickElement(u"guid", item['unique_id'], guid_attrs)
         if item['ttl'] is not None:
             handler.addQuickElement(u"ttl", item['ttl'])
 

django/contrib/syndication/views.py

@@ -118 +118 @@
             feed_copyright = self.__get_dynamic_attr('feed_copyright', obj),
             feed_guid = self.__get_dynamic_attr('feed_guid', obj),
             ttl = self.__get_dynamic_attr('ttl', obj),
+            guid_is_permalink = self.__get_dynamic_attr('guid_is_permalink', obj),
             **self.feed_extra_kwargs(obj)
         )