summaryrefslogtreecommitdiff
path: root/feedgenerator
diff options
context:
space:
mode:
authorBastian Venthur <venthur@debian.org>2021-09-27 21:04:49 +0200
committerJustin Mayer <entroP@gmail.com>2021-09-28 12:53:48 +0200
commitbfe94997048d72d289835c9df236387e9a48fd5f (patch)
treed1fac367c129255fbc784f9fc1d8410954ecb9d4 /feedgenerator
parentf438a4b6eab6714d1738c16e1c19a027768d3b16 (diff)
downloadfeedgenerator-bfe94997048d72d289835c9df236387e9a48fd5f.tar.gz
Fix double subtitles if description & subtitle are provided
Tests all four possible combinations against the expected result.
Diffstat (limited to 'feedgenerator')
-rw-r--r--feedgenerator/django/utils/feedgenerator.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/feedgenerator/django/utils/feedgenerator.py b/feedgenerator/django/utils/feedgenerator.py
index b5d858c..6631788 100644
--- a/feedgenerator/django/utils/feedgenerator.py
+++ b/feedgenerator/django/utils/feedgenerator.py
@@ -325,10 +325,10 @@ class Atom1Feed(SyndicationFeed):
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'])
+ elif self.feed['description'] is not None:
+ handler.addQuickElement("subtitle", self.feed['description'])
for cat in self.feed['categories']:
handler.addQuickElement("category", "", {"term": cat})
if self.feed['feed_copyright'] is not None: