Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions feedgen/entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,17 @@ def atom_entry(self, extensions=True):
_add_text_elm(entry, self.__atom_content, 'content')

for link in self.__atom_link or []:
link = xml_elem('link', entry, href=link['href'])
link_elem = xml_elem('link', entry, href=link['href'])
if link.get('rel'):
link.attrib['rel'] = link['rel']
link_elem.attrib['rel'] = link['rel']
if link.get('type'):
link.attrib['type'] = link['type']
link_elem.attrib['type'] = link['type']
if link.get('hreflang'):
link.attrib['hreflang'] = link['hreflang']
link_elem.attrib['hreflang'] = link['hreflang']
if link.get('title'):
link.attrib['title'] = link['title']
link_elem.attrib['title'] = link['title']
if link.get('length'):
link.attrib['length'] = link['length']
link_elem.attrib['length'] = link['length']

_add_text_elm(entry, self.__atom_summary, 'summary')

Expand Down Expand Up @@ -449,13 +449,13 @@ def link(self, link=None, replace=False, **kwargs):
{'rel': ['alternate', 'enclosure', 'related', 'self', 'via']},
{'rel': 'alternate'})
# RSS only needs one URL. We use the first link for RSS:
for link in self.__atom_link:
if link.get('rel') == 'alternate':
self.__rss_link = link['href']
elif link.get('rel') == 'enclosure':
self.__rss_enclosure = {'url': link['href']}
self.__rss_enclosure['type'] = link.get('type')
self.__rss_enclosure['length'] = link.get('length') or '0'
for litem in self.__atom_link:
if litem.get('rel') == 'alternate':
self.__rss_link = litem['href']
elif litem.get('rel') == 'enclosure':
self.__rss_enclosure = {'url': litem['href']}
self.__rss_enclosure['type'] = litem.get('type')
self.__rss_enclosure['length'] = litem.get('length') or '0'
# return the set with more information (atom)
return self.__atom_link

Expand Down Expand Up @@ -668,7 +668,8 @@ def enclosure(self, url=None, length=None, type=None):
:returns: Data of the enclosure element.
'''
if url is not None:
self.link(href=url, rel='enclosure', type=type, length=str(length))
length_v = str(length) if length is not None else None
self.link(href=url, rel='enclosure', type=type, length=length_v)
return self.__rss_enclosure

def ttl(self, ttl=None):
Expand Down