mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-07 04:29:12 +00:00
Code Issues 32 Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8331 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2008-08-12 22:12:14 +00:00
parent ca020a5edd
commit d05c725308
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/feedgenerator.py
View File

@ -178,13 +178,16 @@ class RssFeed(SyndicationFeed):
def write(self, outfile, encoding): def write(self, outfile, encoding):
handler = SimplerXMLGenerator(outfile, encoding) handler = SimplerXMLGenerator(outfile, encoding)
handler.startDocument() handler.startDocument()
handler.startElement(u"rss", {u"version": self._version}) handler.startElement(u"rss", self.rss_attributes())
handler.startElement(u"channel", self.root_attributes()) handler.startElement(u"channel", self.root_attributes())
self.add_root_elements(handler) self.add_root_elements(handler)
self.write_items(handler) self.write_items(handler)
self.endChannelElement(handler) self.endChannelElement(handler)
handler.endElement(u"rss") handler.endElement(u"rss")
def rss_attributes(self):
return {u"version": self._version}
def write_items(self, handler): def write_items(self, handler):
for item in self.items: for item in self.items:
handler.startElement(u'item', self.item_attributes(item)) handler.startElement(u'item', self.item_attributes(item))
@ -266,7 +269,7 @@ class Atom1Feed(SyndicationFeed):
self.write_items(handler) self.write_items(handler)
handler.endElement(u"feed") handler.endElement(u"feed")
def root_element_attributes(self): def root_attributes(self):
if self.feed['language'] is not None: if self.feed['language'] is not None:
return {u"xmlns": self.ns, u"xml:lang": self.feed['language']} return {u"xmlns": self.ns, u"xml:lang": self.feed['language']}
else: else:

15
tests/regressiontests/syndication/tests.py
View File

@ -20,9 +20,19 @@ class SyndicationFeedTest(TestCase):
def test_rss_feed(self): def test_rss_feed(self):
response = self.client.get('/syndication/feeds/rss/') response = self.client.get('/syndication/feeds/rss/')
doc = minidom.parseString(response.content) doc = minidom.parseString(response.content)
self.assertEqual(len(doc.getElementsByTagName('channel')), 1)
chan = doc.getElementsByTagName('channel')[0] # Making sure there's only 1 `rss` element and that the correct
# RSS version was specified.
feed_elem = doc.getElementsByTagName('rss')
self.assertEqual(len(feed_elem), 1)
feed = feed_elem[0]
self.assertEqual(feed.getAttribute('version'), '2.0')
# Making sure there's only one `channel` element w/in the
# `rss` element.
chan_elem = feed.getElementsByTagName('channel')
self.assertEqual(len(chan_elem), 1)
chan = chan_elem[0]
self.assertChildNodes(chan, ['title', 'link', 'description', 'language', 'lastBuildDate', 'item']) self.assertChildNodes(chan, ['title', 'link', 'description', 'language', 'lastBuildDate', 'item'])
items = chan.getElementsByTagName('item') items = chan.getElementsByTagName('item')
@ -36,6 +46,7 @@ class SyndicationFeedTest(TestCase):
feed = doc.firstChild feed = doc.firstChild
self.assertEqual(feed.nodeName, 'feed') self.assertEqual(feed.nodeName, 'feed')
self.assertEqual(feed.getAttribute('xmlns'), 'http://www.w3.org/2005/Atom')
self.assertChildNodes(feed, ['title', 'link', 'id', 'updated', 'entry']) self.assertChildNodes(feed, ['title', 'link', 'id', 'updated', 'entry'])
entries = feed.getElementsByTagName('entry') entries = feed.getElementsByTagName('entry')