pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feeds: small code cleanup's

master
pictuga 2020-03-17 12:26:34 +01:00
parent d42e19a165
commit f10727f94a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
morss/feeds.py
View File

@ -261,6 +261,7 @@ class ParserXML(ParserBase):
return test.groups() if test else (rule, None) return test.groups() if test else (rule, None)
def _resolve_ns(self, rule): def _resolve_ns(self, rule):
# shortname to full name
match = re.search(r'^([^:]+):([^:]+)$', rule) # to match fakerss:content match = re.search(r'^([^:]+):([^:]+)$', rule) # to match fakerss:content
if match: if match:
match = match.groups() match = match.groups()
@ -294,12 +295,14 @@ class ParserXML(ParserBase):
current = self.root current = self.root
if rrule[0] == '/': if rrule[0] == '/':
# we skip the first chain-element, as we _start_ from the first/root one
# i.e. for "/rss/channel/title" we only keep "/channel/title"
chain = chain[1:] chain = chain[1:]
for (i, node) in enumerate(chain): for (i, node) in enumerate(chain):
test = current.find(self._resolve_ns(node)) test = current.find(self._resolve_ns(node))
if test and i < len(chain) - 1: if test is not None and i < len(chain) - 1:
# yay, go on # yay, go on
current = test current = test
@ -435,7 +438,7 @@ class Feed(object):
item = self.items[-1] item = self.items[-1]
if new is None: if new is None:
return item return
for attr in globals()[self.itemsClass].dic: for attr in globals()[self.itemsClass].dic:
if hasattr(new, attr): if hasattr(new, attr):
@ -448,7 +451,7 @@ class Feed(object):
return self.wrap_items(self.get_raw('items'))[key] return self.wrap_items(self.get_raw('items'))[key]
def __delitem__(self, key): def __delitem__(self, key):
self[key].rmv() self[key].remove()
def __len__(self): def __len__(self):
return len(self.get_raw('items')) return len(self.get_raw('items'))
@ -505,6 +508,7 @@ class FeedXML(Feed, ParserXML):
itemsClass = 'ItemXML' itemsClass = 'ItemXML'
def tostring(self, **k): def tostring(self, **k):
# override needed due to "getroottree" inclusion
return etree.tostring(self.root.getroottree(), **k) return etree.tostring(self.root.getroottree(), **k)