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

[browser2] Rename Combine filter to CombineDate

Browse source
This commit is contained in:
Bezleputh 2014-03-27 10:01:13 +01:00
commit c699dbe4cc
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/biplan/pages.py
View file

@ -24,7 +24,7 @@ import weboob.tools.date as date_util
from .calendar import BiplanCalendarEventConcert, BiplanCalendarEventTheatre from .calendar import BiplanCalendarEventConcert, BiplanCalendarEventTheatre
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, SkipItem, ListElement from weboob.tools.browser2.page import HTMLPage, method, ItemElement, SkipItem, ListElement
from weboob.tools.browser2.filters import Filter, Link, CleanText, Env, Regexp, Combine, CleanHTML from weboob.tools.browser2.filters import Filter, Link, CleanText, Env, Regexp, CombineDate, CleanHTML
__all__ = ['ProgramPage', 'EventPage'] __all__ = ['ProgramPage', 'EventPage']
@ -115,8 +115,8 @@ class ProgramPage(HTMLPage):
return False return False
obj_id = Regexp(Link('./div/a'), '/(.*?).html') obj_id = Regexp(Link('./div/a'), '/(.*?).html')
obj_start_date = Combine(BiplanDate('div/div/b'), StartTime('div/div/b')) obj_start_date = CombineDate(BiplanDate('div/div/b'), StartTime('div/div/b'))
obj_end_date = Combine(BiplanDate('div/div/b'), EndTime('.')) obj_end_date = CombineDate(BiplanDate('div/div/b'), EndTime('.'))
obj_price = BiplanPrice('div/div/b') obj_price = BiplanPrice('div/div/b')
obj_summary = CleanText("div/div/div/a/strong") obj_summary = CleanText("div/div/div/a/strong")
@ -142,8 +142,8 @@ class EventPage(HTMLPage):
obj_id = Env('_id') obj_id = Env('_id')
base = "//div[@id='popup']" base = "//div[@id='popup']"
obj_price = BiplanPrice("%s/div/b" % base) obj_price = BiplanPrice("%s/div/b" % base)
obj_start_date = Combine(BiplanDate("%s/div/b" % base), StartTime("%s/div/b" % base)) obj_start_date = CombineDate(BiplanDate("%s/div/b" % base), StartTime("%s/div/b" % base))
obj_end_date = Combine(BiplanDate("%s/div/b" % base), EndTime(".")) obj_end_date = CombineDate(BiplanDate("%s/div/b" % base), EndTime("."))
obj_url = Env('url') obj_url = Env('url')
obj_summary = CleanText('%s/div/div/span' % base) obj_summary = CleanText('%s/div/div/span' % base)
obj_description = CleanHTML('%s/div/div[@class="presentation-popup"]' % base) obj_description = CleanHTML('%s/div/div[@class="presentation-popup"]' % base)

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

@ -344,9 +344,9 @@ class MultiFilter(Filter):
raise NotImplementedError() raise NotImplementedError()
class Combine(MultiFilter): class CombineDate(MultiFilter):
def __init__(self, date, time): def __init__(self, date, time):
super(Combine, self).__init__(date, time) super(CombineDate, self).__init__(date, time)
def filter(self, values): def filter(self, values):
return datetime.datetime.combine(values[0], values[1]) return datetime.datetime.combine(values[0], values[1])