nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[browser2] add a textCleaner parameter to Join

Browse source
This commit is contained in:
Bezleputh 2014-04-10 10:09:30 +02:00
commit 5158aabe98
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
weboob/tools/browser2/filters.py
View file

@ -160,7 +160,13 @@ class TableCell(_Filter):
class CleanHTML(Filter): class CleanHTML(Filter):
def filter(self, txt): def filter(self, txt):
return html2text(html.tostring(txt[0], encoding=unicode)) if isinstance(txt, (tuple,list)):
return ' '.join([self.clean(item) for item in txt])
return self.clean(txt)
@classmethod
def clean(cls, txt):
return html2text(html.tostring(txt, encoding=unicode))
class CleanText(Filter): class CleanText(Filter):
""" """
@ -409,13 +415,14 @@ class Format(MultiFilter):
class Join(Filter): class Join(Filter):
def __init__(self, pattern, selector): def __init__(self, pattern, selector, textCleaner=CleanText):
super(Join, self).__init__(selector) super(Join, self).__init__(selector)
self.pattern = pattern self.pattern = pattern
self.textCleaner = textCleaner
def filter(self, el): def filter(self, el):
res = u'' res = u''
for li in el: for li in el:
res += self.pattern % CleanText.clean(li) res += self.pattern % self.textCleaner.clean(li)
return res return res