Changeset 3143

Timestamp:

06/18/06 20:38:06 (2 years ago)

Author:

mtredinnick

Message:

Fixed #1473 -- Added support for categories back into syndication feeds
(was accidently removed in r1994). Thanks, k.shaposhnikov@gmail.com

Files:

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

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

@@ -74 +74 @@
-            author_link = self.__get_dynamic_attr('author_link', obj),
-            author_email = self.__get_dynamic_attr('author_email', obj),
+            categories = self.__get_dynamic_attr('categories', obj),
-        )
-
@@ -111 +112 @@
-                author_email = author_email,
-                author_link = author_link,
+                categories = self.__get_dynamic_attr('item_categories', item),
-            )
-        return feed

django/trunk/django/utils/feedgenerator.py

@@ -127 +127 @@
-        if self.feed['language'] is not None:
-            handler.addQuickElement(u"language", self.feed['language'])
+        for cat in self.feed['categories']:
+            handler.addQuickElement(u"category", cat)
-        self.write_items(handler)
-        self.endChannelElement(handler)

django/trunk/docs/syndication_feeds.txt

@@ -440 +440 @@
-        author_link = 'http://www.example.com/' # Hard-coded author URL.
-
+        # CATEGORIES -- One of the following three is optional. The framework
+        # looks for them in this order. In each case, the method/attribute
+        # should return an iterable object that returns strings.
+
+        def categories(self, obj):
+            """
+            Takes the object returned by get_object() and returns the feed's
+            categories as iterable over strings.
+            """
+
+        def categories(self):
+            """
+            Returns the feed's categories as iterable over strings.
+            """
+
+        categories = ("python", "django") # Hard-coded list of categories.
+
-        # ITEMS -- One of the following three is required. The framework looks
-        # for them in this order.
@@ -602 +619 @@
-
-        item_pubdate = datetime.datetime(2005, 5, 3) # Hard-coded pubdate.
+
+        # ITEM CATEGORIES -- It's optional to use one of these three. This is
+        # a hook that specifies how to get the list of categories for a given
+        # item. In each case, the method/attribute should return an iterable
+        # object that returns strings.
+
+        def item_categories(self, item):
+            """
+            Takes an item, as returned by items(), and returns the item's
+            categories.
+            """
+
+        def item_categories(self):
+            """
+            Returns the categories for every item in the feed.
+            """
+
+        item_categories = ("python", "django") # Hard-coded categories.
+
-
-The low-level framework