diff options
| author | Bastian Venthur <venthur@debian.org> | 2021-08-17 17:49:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 17:49:29 +0200 |
| commit | ae04e8a05b5136eebbc9343137a7e0987737bf50 (patch) | |
| tree | 1a1e19685ebc21c925d7a27784f5669e42eb17ec | |
| parent | bd396480f3dc82a815f37cc6243c7568aa1d0f91 (diff) | |
| download | feedgenerator-ae04e8a05b5136eebbc9343137a7e0987737bf50.tar.gz | |
Use description field as subtitle for Atom feeds, if provided (#23)
| -rw-r--r-- | feedgenerator/django/utils/feedgenerator.py | 4 | ||||
| -rw-r--r-- | tests_feedgenerator/test_feedgenerator.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/feedgenerator/django/utils/feedgenerator.py b/feedgenerator/django/utils/feedgenerator.py index 0da6ab1..8158d2a 100644 --- a/feedgenerator/django/utils/feedgenerator.py +++ b/feedgenerator/django/utils/feedgenerator.py @@ -333,6 +333,10 @@ class Atom1Feed(SyndicationFeed): if self.feed['author_link'] is not None: handler.addQuickElement("uri", self.feed['author_link']) handler.endElement("author") + # try to use description or subtitle if provided, subtitle has + # precedence above description + if self.feed['description'] is not None: + handler.addQuickElement("subtitle", self.feed['description']) if self.feed['subtitle'] is not None: handler.addQuickElement("subtitle", self.feed['subtitle']) for cat in self.feed['categories']: diff --git a/tests_feedgenerator/test_feedgenerator.py b/tests_feedgenerator/test_feedgenerator.py index 140b631..6399f9d 100644 --- a/tests_feedgenerator/test_feedgenerator.py +++ b/tests_feedgenerator/test_feedgenerator.py @@ -39,7 +39,11 @@ EXPECTED_RESULT_RSS = """<?xml version="1.0" encoding="utf-8"?> </description><language>en</language><lastBuildDate>%DATE%</lastBuildDate><item><title>Hello</title><link>http://www.holovaty.com/test/</link><description>Testing.</description><pubDate>Thu, 11 Aug 2016 00:00:00 -0000</pubDate></item></channel></rss>""" EXPECTED_RESULT_ATOM = """<?xml version="1.0" encoding="utf-8"?> -<feed xml:lang="en" xmlns="http://www.w3.org/2005/Atom"><title>Poynter E-Media Tidbits</title><link href="http://www.poynter.org/column.asp?id=31" rel="alternate"></link><id>http://www.poynter.org/column.asp?id=31</id><updated>%DATE%</updated><entry><title>Hello</title><link href="http://www.holovaty.com/test/" rel="alternate"></link><published>2016-08-11T00:00:00Z</published><updated>2016-08-11T00:00:00Z</updated><id>tag:www.holovaty.com,2016-08-11:/test/</id><summary type="html">Testing.</summary><content type="html">Full content of our testing entry.</content></entry></feed>""" +<feed xml:lang="en" xmlns="http://www.w3.org/2005/Atom"><title>Poynter E-Media Tidbits</title><link href="http://www.poynter.org/column.asp?id=31" rel="alternate"></link><id>http://www.poynter.org/column.asp?id=31</id><updated>%DATE%</updated><subtitle>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. + </subtitle><entry><title>Hello</title><link href="http://www.holovaty.com/test/" rel="alternate"></link><published>2016-08-11T00:00:00Z</published><updated>2016-08-11T00:00:00Z</updated><id>tag:www.holovaty.com,2016-08-11:/test/</id><summary type="html">Testing.</summary><content type="html">Full content of our testing entry.</content></entry></feed>""" ENCODING = 'utf-8' |