From a4b80e242162a7d6ac2337a2a621a82027c549b7 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Sat, 19 Sep 2015 07:59:18 +0200 Subject: [PATCH] Refs #13110 -- Fixed mistakes in the new multiple enclosure feed tests --- django/utils/feedgenerator.py | 2 +- tests/syndication_tests/feeds.py | 4 ++-- tests/syndication_tests/tests.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/django/utils/feedgenerator.py b/django/utils/feedgenerator.py index c67fedb277d..3fae71cdee0 100644 --- a/django/utils/feedgenerator.py +++ b/django/utils/feedgenerator.py @@ -427,7 +427,7 @@ class Atom1Feed(SyndicationFeed): handler.addQuickElement("summary", item['description'], {"type": "html"}) # Enclosures. - for enclosure in item.get('enclosures') or []: + for enclosure in item['enclosures']: handler.addQuickElement('link', '', { 'rel': 'enclosure', 'href': enclosure.url, diff --git a/tests/syndication_tests/feeds.py b/tests/syndication_tests/feeds.py index ce938b8356a..f4162b345e6 100644 --- a/tests/syndication_tests/feeds.py +++ b/tests/syndication_tests/feeds.py @@ -208,6 +208,6 @@ class TestMultipleEnclosureAtomFeed(TestAtomFeed): """ def item_enclosures(self, item): return [ - feedgenerator.Enclosure('http://example.com/hello.png', 0, 'image/png'), - feedgenerator.Enclosure('http://example.com/goodbye.png', 0, 'image/png'), + feedgenerator.Enclosure('http://example.com/hello.png', '0', 'image/png'), + feedgenerator.Enclosure('http://example.com/goodbye.png', '0', 'image/png'), ] diff --git a/tests/syndication_tests/tests.py b/tests/syndication_tests/tests.py index 5a7cfbb0572..5369320bdd8 100644 --- a/tests/syndication_tests/tests.py +++ b/tests/syndication_tests/tests.py @@ -300,7 +300,7 @@ class SyndicationFeedTest(FeedTestCase): self.assertNotEqual(published, updated) def test_atom_single_enclosure(self): - response = self.client.get('/syndication/rss2/single-enclosure/') + response = self.client.get('/syndication/atom/single-enclosure/') feed = minidom.parseString(response.content).firstChild items = feed.getElementsByTagName('entry') for item in items: @@ -309,7 +309,7 @@ class SyndicationFeedTest(FeedTestCase): self.assertEqual(len(links), 1) def test_atom_multiple_enclosures(self): - response = self.client.get('/syndication/rss2/single-enclosure/') + response = self.client.get('/syndication/atom/multiple-enclosure/') feed = minidom.parseString(response.content).firstChild items = feed.getElementsByTagName('entry') for item in items: