tsr/planet
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Wordpress media:titles are overriding item titles

Browse Source
This commit is contained in:
Sam Ruby 2007-11-01 10:24:02 -04:00
parent d73e98e874
commit eff28717bd
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
planet/vendor/feedparser.py vendored
View File

@ -11,7 +11,7 @@ Recommended: Python 2.3 or later
Recommended: CJKCodecs and iconv_codec <http://cjkpython.i18n.org/> Recommended: CJKCodecs and iconv_codec <http://cjkpython.i18n.org/>
""" """
__version__ = "4.2-pre-" + "$Revision: 266 $"[11:14] + "-svn" __version__ = "4.2-pre-" + "$Revision: 270 $"[11:14] + "-svn"
__license__ = """Copyright (c) 2002-2007, Mark Pilgrim, All rights reserved. __license__ = """Copyright (c) 2002-2007, Mark Pilgrim, All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
@ -466,6 +466,7 @@ class _FeedParserMixin:
self.baseuri = baseuri or '' self.baseuri = baseuri or ''
self.lang = baselang or None self.lang = baselang or None
self.svgOK = 0 self.svgOK = 0
self.hasTitle = 0
if baselang: if baselang:
self.feeddata['language'] = baselang.replace('_','-') self.feeddata['language'] = baselang.replace('_','-')
@ -801,6 +802,9 @@ class _FeedParserMixin:
# categories/tags/keywords/whatever are handled in _end_category # categories/tags/keywords/whatever are handled in _end_category
if element == 'category': if element == 'category':
return output return output
if element == 'title' and self.hasTitle:
return output
# store output in appropriate place(s) # store output in appropriate place(s)
if self.inentry and not self.insource: if self.inentry and not self.insource:
@ -967,6 +971,7 @@ class _FeedParserMixin:
context = self._getContext() context = self._getContext()
context.setdefault('image', FeedParserDict()) context.setdefault('image', FeedParserDict())
self.inimage = 1 self.inimage = 1
self.hasTitle = 0
self.push('image', 0) self.push('image', 0)
def _end_image(self): def _end_image(self):
@ -977,6 +982,7 @@ class _FeedParserMixin:
context = self._getContext() context = self._getContext()
context.setdefault('textinput', FeedParserDict()) context.setdefault('textinput', FeedParserDict())
self.intextinput = 1 self.intextinput = 1
self.hasTitle = 0
self.push('textinput', 0) self.push('textinput', 0)
_start_textInput = _start_textinput _start_textInput = _start_textinput
@ -1189,6 +1195,7 @@ class _FeedParserMixin:
self.push('item', 0) self.push('item', 0)
self.inentry = 1 self.inentry = 1
self.guidislink = 0 self.guidislink = 0
self.hasTitle = 0
id = self._getAttribute(attrsD, 'rdf:about') id = self._getAttribute(attrsD, 'rdf:about')
if id: if id:
context = self._getContext() context = self._getContext()
@ -1383,8 +1390,13 @@ class _FeedParserMixin:
value = self.popContent('title') value = self.popContent('title')
if not value: return if not value: return
context = self._getContext() context = self._getContext()
self.hasTitle = 1
_end_dc_title = _end_title _end_dc_title = _end_title
_end_media_title = _end_title
def _end_media_title(self):
hasTitle = self.hasTitle
self._end_title()
self.hasTitle = hasTitle
def _start_description(self, attrsD): def _start_description(self, attrsD):
context = self._getContext() context = self._getContext()