Changeset 8331

Timestamp:

08/12/08 17:12:14 (4 months ago)

Author:

jacob

Message:

Fixed #8253: fixed xmlns regression for Atom feeds, and in the process added a hook for adding attributes specifically on the root <rss> element (for RSS feeds only, of course). Patch by Justin Bronn.

Files:

• django/trunk/django/utils/feedgenerator.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/syndication/tests.py (modified) (2 diffs)

django/trunk/django/utils/feedgenerator.py

@@ -179 +179 @@
-        handler = SimplerXMLGenerator(outfile, encoding)
-        handler.startDocument()
-{u"version": self._version}
+self.rss_attributes()
-        handler.startElement(u"channel", self.root_attributes())
-        self.add_root_elements(handler)
@@ -185 +185 @@
-        self.endChannelElement(handler)
-        handler.endElement(u"rss")
+
+    def rss_attributes(self):
+        return {u"version": self._version}
-
-    def write_items(self, handler):
@@ -267 +270 @@
-        handler.endElement(u"feed")
-
-element_
+
-        if self.feed['language'] is not None:
-            return {u"xmlns": self.ns, u"xml:lang": self.feed['language']}

django/trunk/tests/regressiontests/syndication/tests.py

@@ -21 +21 @@
-        response = self.client.get('/syndication/feeds/rss/')
-        doc = minidom.parseString(response.content)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        self.assertChildNodes(chan, ['title', 'link', 'description', 'language', 'lastBuildDate', 'item'])
-    
@@ -37 +47 @@
-        feed = doc.firstChild
-        self.assertEqual(feed.nodeName, 'feed')
+        self.assertEqual(feed.getAttribute('xmlns'), 'http://www.w3.org/2005/Atom') 
-        self.assertChildNodes(feed, ['title', 'link', 'id', 'updated', 'entry'])        
-