Thelie/python-feedgen
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename url to uri in Atom feeds

Browse source 
According to RFC 4287, there is no atom:url element, only atom:uri, so
replace occurrences of atom:url with atom:uri for compliance.

Also rename variables holding atom:uri from email to uri to better
indicate what they actually are.
This commit is contained in:
Zhiming Wang 2016-12-19 00:41:01 -05:00
parent 217e0842d0
commit 9f4431880e
No known key found for this signature in database
GPG key ID: 5B58F95EC95965D8
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
feedgen/entry.py
View file

@ -90,8 +90,8 @@ class FeedEntry(object):
email = etree.SubElement(author, 'email') email = etree.SubElement(author, 'email')
email.text = a.get('email') email.text = a.get('email')
if a.get('uri'): if a.get('uri'):
email = etree.SubElement(author, 'url') uri = etree.SubElement(author, 'uri')
email.text = a.get('uri') uri.text = a.get('uri')
if self.__atom_content: if self.__atom_content:
content = etree.SubElement(entry, 'content') content = etree.SubElement(entry, 'content')
@ -156,8 +156,8 @@ class FeedEntry(object):
email = etree.SubElement(contrib, 'email') email = etree.SubElement(contrib, 'email')
email.text = c.get('email') email.text = c.get('email')
if c.get('uri'): if c.get('uri'):
email = etree.SubElement(contrib, 'url') uri = etree.SubElement(contrib, 'uri')
email.text = c.get('uri') uri.text = c.get('uri')
if self.__atom_published: if self.__atom_published:
published = etree.SubElement(entry, 'published') published = etree.SubElement(entry, 'published')

10
feedgen/feed.py
View file

@ -47,7 +47,7 @@ class FeedGenerator(object):
self.__atom_contributor = None self.__atom_contributor = None
self.__atom_generator = { self.__atom_generator = {
'value' :'python-feedgen', 'value' :'python-feedgen',
'url' :'http://lkiesow.github.io/python-feedgen', 'uri' :'http://lkiesow.github.io/python-feedgen',
'version':feedgen.version.version_str } #{value*,uri,version} 'version':feedgen.version.version_str } #{value*,uri,version}
self.__atom_icon = None self.__atom_icon = None
self.__atom_logo = None self.__atom_logo = None
@ -124,8 +124,8 @@ class FeedGenerator(object):
email = etree.SubElement(author, 'email') email = etree.SubElement(author, 'email')
email.text = a.get('email') email.text = a.get('email')
if a.get('uri'): if a.get('uri'):
email = etree.SubElement(author, 'url') uri = etree.SubElement(author, 'uri')
email.text = a.get('uri') uri.text = a.get('uri')
for l in self.__atom_link or []: for l in self.__atom_link or []:
link = etree.SubElement(feed, 'link', href=l['href']) link = etree.SubElement(feed, 'link', href=l['href'])
@ -159,8 +159,8 @@ class FeedGenerator(object):
email = etree.SubElement(contrib, 'email') email = etree.SubElement(contrib, 'email')
email.text = c.get('email') email.text = c.get('email')
if c.get('uri'): if c.get('uri'):
email = etree.SubElement(contrib, 'url') uri = etree.SubElement(contrib, 'uri')
email.text = c.get('uri') uri.text = c.get('uri')
if self.__atom_generator: if self.__atom_generator:
generator = etree.SubElement(feed, 'generator') generator = etree.SubElement(feed, 'generator')

2
tests/test_feed.py
View file

@ -215,7 +215,7 @@ class TestSequenceFunctions(unittest.TestCase):
assert feed.find("{%s}subtitle" % nsAtom).text == self.subtitle assert feed.find("{%s}subtitle" % nsAtom).text == self.subtitle
assert feed.find("{%s}contributor" % nsAtom).find("{%s}name" % nsAtom).text == self.contributor['name'] assert feed.find("{%s}contributor" % nsAtom).find("{%s}name" % nsAtom).text == self.contributor['name']
assert feed.find("{%s}contributor" % nsAtom).find("{%s}email" % nsAtom).text == self.contributor['email'] assert feed.find("{%s}contributor" % nsAtom).find("{%s}email" % nsAtom).text == self.contributor['email']
assert feed.find("{%s}contributor" % nsAtom).find("{%s}url" % nsAtom).text == self.contributor['uri'] assert feed.find("{%s}contributor" % nsAtom).find("{%s}uri" % nsAtom).text == self.contributor['uri']
assert feed.find("{%s}rights" % nsAtom).text == self.copyright assert feed.find("{%s}rights" % nsAtom).text == self.copyright
def test_rssFeedFile(self): def test_rssFeedFile(self):