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

Merge branch 'master' of https://github.com/shon/python-feedgen

Browse source 
This merges in a pull request by Shekhar, adding support for CDATA
content:

---

If type specified CDATA content won't be escaped. This makes it easier
for RSS publishers and readers. Also adheres CDATA recommendation at
http://www.rssboard.org/rss-profile#element-channel-item-description

---

Signed-off-by: Lars Kiesow <lkiesow@uos.de>
This commit is contained in:
Lars Kiesow 2014-07-20 23:26:27 +02:00
commit 36a16fe725
No known key found for this signature in database
GPG key ID: 5DAFE8D9C823CE73
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
feedgen/entry.py
View file

@ -102,6 +102,8 @@ class FeedEntry(object):
content.append(etree.fromstring('''<div content.append(etree.fromstring('''<div
xmlns="http://www.w3.org/1999/xhtml">%s</div>''' % \ xmlns="http://www.w3.org/1999/xhtml">%s</div>''' % \
self.__atom_content.get('content'))) self.__atom_content.get('content')))
elif type == 'CDATA':
content.text = etree.CDATA(self.__atom_content)
# Emed the text in escaped form # Emed the text in escaped form
elif not type or type.startswith('text') or type == 'html': elif not type or type.startswith('text') or type == 'html':
content.text = self.__atom_content.get('content') content.text = self.__atom_content.get('content')
@ -187,13 +189,14 @@ class FeedEntry(object):
description.text = self.__rss_description description.text = self.__rss_description
content = etree.SubElement(entry, '{%s}encoded' % content = etree.SubElement(entry, '{%s}encoded' %
'http://purl.org/rss/1.0/modules/content/') 'http://purl.org/rss/1.0/modules/content/')
content.text = self.__rss_content content.text = etree.CDATA(self.__rss_content['content']) \
if self.__rss_content.get('type', '') == 'CDATA' else self.__rss_content['content']
elif self.__rss_description: elif self.__rss_description:
description = etree.SubElement(entry, 'description') description = etree.SubElement(entry, 'description')
description.text = self.__rss_description description.text = self.__rss_description
elif self.__rss_content: elif self.__rss_content:
description = etree.SubElement(entry, 'description') description = etree.SubElement(entry, 'description')
description.text = self.__rss_content description.text = self.__rss_content['content']
for a in self.__rss_author or []: for a in self.__rss_author or []:
author = etree.SubElement(entry, 'author') author = etree.SubElement(entry, 'author')
author.text = a author.text = a
@ -345,15 +348,17 @@ class FeedEntry(object):
:param content: The content of the feed entry. :param content: The content of the feed entry.
:param src: Link to the entries content. :param src: Link to the entries content.
:param type: If type is CDATA content would not be escaped.
:returns: Content element of the entry. :returns: Content element of the entry.
''' '''
if not src is None: if not src is None:
self.__atom_content = {'src':src} self.__atom_content = {'src':src}
elif not content is None: elif not content is None:
self.__atom_content = {'content':content} self.__atom_content = {'content':content}
self.__rss_content = {'content':content}
if not type is None: if not type is None:
self.__atom_content['type'] = type self.__atom_content['type'] = type
self.__rss_content = content self.__rss_content['type'] = type
return self.__atom_content return self.__atom_content