diff options
| -rw-r--r-- | feedgenerator/django/utils/feedgenerator.py | 4 | ||||
| -rw-r--r-- | setup.py | 7 | ||||
| -rw-r--r-- | tests_feedgenerator/test_feedgenerator.py | 6 | ||||
| -rw-r--r-- | tox.ini | 37 |
4 files changed, 24 insertions, 30 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']: @@ -1,5 +1,7 @@ #!/usr/bin/env python +from io import open + # Using setuptools rather than distutils to get the `develop` command from setuptools import setup @@ -8,7 +10,7 @@ NAME = 'feedgenerator' PACKAGES = ['feedgenerator', 'feedgenerator.django', 'feedgenerator.django.utils'] DESCRIPTION = 'Standalone version of django.utils.feedgenerator' -LONG_DESCRIPTION = open('README.rst').read() +LONG_DESCRIPTION = open('README.rst', encoding='UTF-8').read() URL = "https://github.com/getpelican/feedgenerator" @@ -19,11 +21,10 @@ CLASSIFIERS = ['Development Status :: 5 - Production/Stable', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development :: Libraries :: Python Modules', 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' @@ -1,29 +1,14 @@ [tox] -envlist = py26,py27,py32,py33,py34,py35 +envlist = py{3.6,3.7,3.8,3.9} [testenv] -commands = unit2 discover - -[testenv:py26] -deps = - unittest2 - -[testenv:py27] -deps = - unittest2 - -[testenv:py32] -deps = - unittest2py3k - -[testenv:py33] -deps = - unittest2py3k - -[testenv:py34] -deps = - unittest2py3k - -[testenv:py35] -deps = - unittest2py3k +basepython = + py3.6: python3.6 + py3.7: python3.7 + py3.8: python3.8 + py3.9: python3.9 +commands = + {envpython} --version + pytest +deps = + pytest |