convert to browser2

modules/alloresto/browser.py

@@ -18,7 +18,8 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
+from weboob.tools.browser2 import LoginBrowser, URL, need_login
+from weboob.tools.browser import BrowserIncorrectPassword
 
 from .pages import LoginPage, AccountsPage
 
@@ -26,58 +27,40 @@ from .pages import LoginPage, AccountsPage
 __all__ = ['AlloRestoBrowser']
 
 
-class AlloRestoBrowser(BaseBrowser):
-    DOMAIN = 'www.alloresto.fr'
-    PROTOCOL = 'http'
-    ENCODING = 'utf-8'
-    PAGES = {'http://www.alloresto.fr/identification-requise.*':         LoginPage,
-             'http://www.alloresto.fr/chez-moi/releve-compte-miams':    AccountsPage,
-            }
+class AlloRestoBrowser(LoginBrowser):
+    BASEURL = 'http://www.alloresto.fr'
 
-    def is_logged(self):
-        return self.page is not None and not self.is_on_page(LoginPage)
+    login =     URL('/identification-requise.*',        LoginPage)
+    accounts =  URL('/chez-moi/releve-compte-miams',    AccountsPage)
 
-    def home(self):
-        self.go_on_accounts_list()
-
-    def login(self):
+    def do_login(self):
         assert isinstance(self.username, basestring)
         assert isinstance(self.password, basestring)
 
-        if not self.is_on_page(LoginPage):
-            self.location('http://www.alloresto.fr/identification-requise', no_login=True)
-
+        self.accounts.stay_or_go()
         self.page.login(self.username, self.password)
 
-        if not self.is_logged():
+        if self.login.is_here():
             raise BrowserIncorrectPassword()
 
-    def go_on_accounts_list(self):
-        self.location('http://www.alloresto.fr/chez-moi/releve-compte-miams')
-
+    @need_login
     def get_accounts_list(self):
-        if not self.is_on_page(AccountsPage):
-            self.go_on_accounts_list()
-        return self.page.get_list()
+        return self.accounts.stay_or_go().iter_accounts()
 
+    @need_login
     def get_account(self, id):
         assert isinstance(id, basestring)
 
-        l = self.get_accounts_list()
-        for a in l:
+        for a in self.get_accounts_list():
             if a.id == id:
                 return a
 
         return None
 
+    @need_login
     def get_history(self, account):
-        if not self.is_on_page(AccountsPage):
-            self.go_on_accounts_list()
-
-        return self.page.get_transactions()
+        return self.accounts.stay_or_go().get_transactions(type='consommable')
 
+    @need_login
     def get_coming(self, account):
-        if not self.is_on_page(AccountsPage):
-            self.go_on_accounts_list()
-
-        return self.page.get_transactions('acquisition')
+        return self.accounts.stay_or_go().get_transactions(type='acquisition')