[hybride] adapt to browser2

modules/hybride/browser.py

@@ -17,32 +17,28 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
-from weboob.tools.browser.decorators import id2url
-from weboob.tools.browser import BaseBrowser
-from .calendar import HybrideCalendarEvent
+#from weboob.tools.browser.decorators import id2url
+#from weboob.tools.browser import BaseBrowser
+#from .calendar import HybrideCalendarEvent
 from .pages import ProgramPage, EventPage
 
 
+from weboob.tools.browser2 import PagesBrowser, URL, Firefox
+
 __all__ = ['HybrideBrowser']
 
 
-class HybrideBrowser(BaseBrowser):
-    PROTOCOL = 'http'
-    DOMAIN = 'www.lhybride.org'
-    ENCODING = None
+class HybrideBrowser(PagesBrowser):
+    PROFILE = Firefox()
+    BASEURL = 'http://www.lhybride.org'
 
-    PAGES = {
-        '%s://%s/programme.html' % (PROTOCOL, DOMAIN): ProgramPage,
-        '%s://%s/programme/item/(.*?)' % (PROTOCOL, DOMAIN): EventPage,
-    }
+    program_page = URL('/programme.html', ProgramPage)
+    event_page = URL('/programme/item/(?P<_id>.*)', EventPage)
 
     def list_events(self, date_from, date_to=None, city=None, categories=None):
-        self.location('%s://%s/programme.html' % (self.PROTOCOL, self.DOMAIN))
-        assert self.is_on_page(ProgramPage)
-        return self.page.list_events(date_from, date_to, city, categories)
+        self.program_page.stay_or_go()
+        self.page.set_filters(date_from, date_to, city, categories)
+        return self.page.list_events()
 
-    @id2url(HybrideCalendarEvent.id2url)
-    def get_event(self, url, event=None):
-        self.location(url)
-        assert self.is_on_page(EventPage)
-        return self.page.get_event(url, event)
+    def get_event(self, _id, event=None):
+        return self.event_page.stay_or_go(_id=_id).get_event(obj=event)