Changeset 6570

Timestamp:

10/20/07 09:54:38 (10 months ago)

Author:

mtredinnick

Message:

Fixed #3502 -- Added TTL support for RSS (not Atom) feeds. Patch from
jason.sidabras@gmail.com and Thomas Kerpe.

Files:

• django/trunk/AUTHORS (modified) (2 diffs)
• django/trunk/django/contrib/syndication/feeds.py (modified) (1 diff)
• django/trunk/django/utils/feedgenerator.py (modified) (6 diffs)
• django/trunk/docs/syndication_feeds.txt (modified) (1 diff)

django/trunk/AUTHORS

@@ -171 +171 @@
-    Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
-    Ian G. Kelly <ian.g.kelly@gmail.com>
+    Thomas Kerpe <thomas@kerpe.net>
-    Ben Khoo <khoobks@westnet.com.au>
-    Garth Kidd <http://www.deadlybloodyserious.com/>
@@ -274 +275 @@
-    John Shaffer <jshaffer2112@gmail.com>
-    Pete Shinners <pete@shinners.org>
+    jason.sidabras@gmail.com
-    Jozko Skrablin <jozko.skrablin@gmail.com>
-    SmileyChris <smileychris@gmail.com>

django/trunk/django/contrib/syndication/feeds.py

@@ -90 +90 @@
-            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),
-        )
-

django/trunk/django/utils/feedgenerator.py

@@ -46 +46 @@
-    def __init__(self, title, link, description, language=None, author_email=None,
-            author_name=None, author_link=None, subtitle=None, categories=None,
-
+, ttl=None
-        to_unicode = lambda s: force_unicode(s, strings_only=True)
-        if categories:
@@ -63 +63 @@
-            'feed_copyright': to_unicode(feed_copyright),
-            'id': feed_guid or link,
+            'ttl': ttl,
-        }
-        self.items = []
@@ -68 +69 @@
-    def add_item(self, title, link, description, author_email=None,
-        author_name=None, author_link=None, pubdate=None, comments=None,
-
+, ttl=None
-        """
-        Adds an item to the feed. All args are expected to be Python Unicode
@@ -90 +91 @@
-            'categories': categories or (),
-            'item_copyright': to_unicode(item_copyright),
+            'ttl': ttl,
-        })
-
@@ -147 +149 @@
-            handler.addQuickElement(u"copyright", self.feed['feed_copyright'])
-        handler.addQuickElement(u"lastBuildDate", rfc2822_date(self.latest_post_date()).decode('ascii'))
+        if self.feed['ttl'] is not None:
+            handler.addQuickElement(u"ttl", self.feed['ttl'])
-        self.write_items(handler)
-        self.endChannelElement(handler)
@@ -191 +195 @@
-            if item['unique_id'] is not None:
-                handler.addQuickElement(u"guid", item['unique_id'])
+            if item['ttl'] is not None:
+                handler.addQuickElement(u"ttl", item['ttl'])
-
-            # Enclosure.

django/trunk/docs/syndication_feeds.txt

@@ -548 +548 @@
-        copyright = 'Copyright (c) 2007, Sally Smith' # Hard-coded copyright notice.
-
+        # TTL -- One of the following three is optional. The framework looks
+        # for them in this order. Ignored for Atom feeds.
+
+        def ttl(self, obj):
+            """
+            Takes the object returned by get_object() and returns the feed's
+            TTL (Time to live) as a normal Python string.
+            """
+
+        def ttl(self):
+            """
+            Returns the feed's ttl as a normal Python string.
+            """
+
+        ttl = 600 # Hard-coded Time to live.
+
-        # ITEMS -- One of the following three is required. The framework looks
-        # for them in this order.