diff options
| author | Justin Mayer <entroP@gmail.com> | 2016-04-06 17:56:54 -0700 |
|---|---|---|
| committer | Justin Mayer <entroP@gmail.com> | 2016-04-06 17:56:54 -0700 |
| commit | 5d54cf0af3c3b5ba5ac2791c06720cacf7b16ac1 (patch) | |
| tree | 1e219231e775fc008149c14e24a574d9e3fcb262 | |
| parent | b836c975f674f4c23dce2ef8600005e99de53ead (diff) | |
| parent | 45e71c772c83ea8d567adeb6d3f879b0e0dca4d3 (diff) | |
| download | feedgenerator-5d54cf0af3c3b5ba5ac2791c06720cacf7b16ac1.tar.gz | |
Merge pull request #4 from Scheirle/get_tag_uri
Changes get_tag_uri so that the '/' before a fragment gets only added if there is a fragment
| -rw-r--r-- | feedgenerator/django/utils/feedgenerator.py | 7 | ||||
| -rw-r--r-- | tests_feedgenerator/test_feedgenerator.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/feedgenerator/django/utils/feedgenerator.py b/feedgenerator/django/utils/feedgenerator.py index 04b7d73..d89c136 100644 --- a/feedgenerator/django/utils/feedgenerator.py +++ b/feedgenerator/django/utils/feedgenerator.py @@ -36,7 +36,7 @@ from .six import StringIO from .timezone import is_aware def rfc2822_date(date): - # We can't use strftime() because it produces locale-dependant results, so + # We can't use strftime() because it produces locale-dependent results, so # we have to map english month and day names manually months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',) days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun') @@ -80,7 +80,10 @@ def get_tag_uri(url, date): d = '' if date is not None: d = ',%s' % datetime_safe.new_datetime(date).strftime('%Y-%m-%d') - return 'tag:%s%s:%s/%s' % (bits.hostname, d, bits.path, bits.fragment) + fragment = '' + if bits.fragment != '': + fragment = '/%s' % (bits.fragment) + return 'tag:%s%s:%s%s' % (bits.hostname, d, bits.path, fragment) class SyndicationFeed(object): "Base class for all syndication feeds. Subclasses should provide write()" diff --git a/tests_feedgenerator/test_feedgenerator.py b/tests_feedgenerator/test_feedgenerator.py index 45c64cd..c02a555 100644 --- a/tests_feedgenerator/test_feedgenerator.py +++ b/tests_feedgenerator/test_feedgenerator.py @@ -37,7 +37,7 @@ 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></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><id>tag:www.holovaty.com:/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><entry><title>Hello</title><link href="http://www.holovaty.com/test/" rel="alternate"></link><id>tag:www.holovaty.com:/test/</id><summary type="html">Testing.</summary><content type="html">Full content of our testing entry.</content></entry></feed>""" ENCODING = 'utf-8' |