diff options
| author | Alex Brown <alex@alexanderdbrown.com> | 2014-01-06 11:12:06 +0000 |
|---|---|---|
| committer | Alex Brown <alex@alexanderdbrown.com> | 2014-01-06 11:28:52 +0000 |
| commit | ecfb8f7221828339ef36c65ab76e1ddc143871c3 (patch) | |
| tree | 58c54bcbf6d02e7b9ea298d8db748697a0333214 | |
| parent | 7df76dc0a18e67ce601af3a2e00bb3c8c821ad46 (diff) | |
| download | feedgenerator-ecfb8f7221828339ef36c65ab76e1ddc143871c3.tar.gz | |
Remove unnecessary atom elements.
| -rw-r--r-- | feedgenerator/django/utils/feedgenerator.py | 9 | ||||
| -rw-r--r-- | test.rss | 4 | ||||
| -rw-r--r-- | tests_feedgenerator/test_feedgenerator.py | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/feedgenerator/django/utils/feedgenerator.py b/feedgenerator/django/utils/feedgenerator.py index e8e4d87..60e1527 100644 --- a/feedgenerator/django/utils/feedgenerator.py +++ b/feedgenerator/django/utils/feedgenerator.py @@ -220,8 +220,7 @@ class RssFeed(SyndicationFeed): handler.endElement("rss") def rss_attributes(self): - return {'xmlns:atom': 'http://www.w3.org/2005/Atom', - 'version': self._version} + return {'version': self._version} def write_items(self, handler): for item in self.items: @@ -230,12 +229,12 @@ class RssFeed(SyndicationFeed): handler.endElement("item") def add_root_elements(self, handler): + # Required Elements as per the specification handler.addQuickElement("title", self.feed['title']) handler.addQuickElement("link", self.feed['link']) handler.addQuickElement("description", self.feed['description']) - if self.feed['feed_url'] is not None: - handler.addQuickElement("atom:link", None, - {"rel": "self", "href": self.feed['feed_url']}) + + # Optional Channel Elements if self.feed['language'] is not None: handler.addQuickElement("language", self.feed['language']) for cat in self.feed['categories']: @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title>Poynter E-Media Tidbits</title><link>http://www.poynter.org/column.asp?id=31</link><description>A group Weblog by the sharpest minds in online media/journalism/publishing. +<rss version="2.0"><channel><title>Poynter E-Media Tidbits</title><link>http://www.poynter.org/column.asp?id=31</link><description>A group Weblog by the sharpest minds in online media/journalism/publishing. Umlauts: äöüßÄÖÜ Chinese: 老师是四十四，是不是？ Finnish: Mustan kissan paksut posket. (ah, no special chars) Kärpänen sanoi kärpäselle: tuu kattoon kattoon ku kaveri tapettiin tapettiin. - </description><language>en</language><lastBuildDate>Sun, 26 Aug 2012 07:44:28 -0000</lastBuildDate><item><title>Hello</title><link>http://www.holovaty.com/test/</link><description>Testing.</description></item></channel></rss>
\ No newline at end of file + </description><language>en</language><lastBuildDate>Sun, 26 Aug 2012 07:44:28 -0000</lastBuildDate><item><title>Hello</title><link>http://www.holovaty.com/test/</link><description>Testing.</description></item></channel></rss> diff --git a/tests_feedgenerator/test_feedgenerator.py b/tests_feedgenerator/test_feedgenerator.py index bce5dd4..7e73337 100644 --- a/tests_feedgenerator/test_feedgenerator.py +++ b/tests_feedgenerator/test_feedgenerator.py @@ -29,7 +29,7 @@ FIXT_ITEM = dict( EXPECTED_RESULT = """<?xml version="1.0" encoding="utf-8"?> -<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>Poynter E-Media Tidbits</title><link>http://www.poynter.org/column.asp?id=31</link><description>A group Weblog by the sharpest minds in online media/journalism/publishing. +<rss version="2.0"><channel><title>Poynter E-Media Tidbits</title><link>http://www.poynter.org/column.asp?id=31</link><description>A group Weblog by the sharpest minds in online media/journalism/publishing. Umlauts: äöüßÄÖÜ Chinese: 老师是四十四，是不是？ Finnish: Mustan kissan paksut posket. (ah, no special chars) Kärpänen sanoi kärpäselle: tuu kattoon kattoon ku kaveri tapettiin tapettiin. |