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

[biplan] adapt to browser2

Browse source
This commit is contained in:
Bezleputh 2014-03-27 00:16:46 +01:00
commit 7c9e47d3fb
4 changed files with 137 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/biplan/backend.py
View file

@ -40,33 +40,29 @@ class BiplanBackend(BaseBackend, ICapCalendarEvent):
def search_events(self, query):
if self.has_matching_categories(query):
with self.browser:
theatre_events = []
concert_events = []
if CATEGORIES.CONCERT in query.categories:
concert_events = self.browser.list_events_concert(query.start_date,
query.end_date,
query.city,
query.categories)
if CATEGORIES.THEATRE in query.categories:
theatre_events = self.browser.list_events_theatre(query.start_date,
query.end_date,
query.city,
query.categories)
theatre_events = []
concert_events = []
if CATEGORIES.CONCERT in query.categories:
concert_events = self.browser.list_events_concert(query.start_date,
query.end_date,
query.city,
query.categories)
if CATEGORIES.THEATRE in query.categories:
theatre_events = self.browser.list_events_theatre(query.start_date,
query.end_date,
query.city,
query.categories)
return itertools.chain(concert_events, theatre_events)
return itertools.chain(concert_events, theatre_events)
def list_events(self, date_from, date_to=None):
with self.browser:
return itertools.chain(self.browser.list_events_concert(date_from, date_to),
self.browser.list_events_theatre(date_from, date_to))
return itertools.chain(self.browser.list_events_concert(date_from, date_to),
self.browser.list_events_theatre(date_from, date_to))
def get_event(self, _id):
with self.browser:
return self.browser.get_event(_id)
return self.browser.get_event(_id)
def fill_obj(self, event, fields):
with self.browser:
return self.browser.get_event(event.id, event)
return self.browser.get_event(event.id, event)
OBJECTS = {BiplanCalendarEvent: fill_obj}