fix carrefourbanque to use new website (and rewrite it with browser2)

modules/carrefourbanque/pages.py

@@ -18,102 +18,55 @@
 # along with weboob. If not, see <http://www.gnu.org/licenses/>.
 
 
-import datetime
-from decimal import Decimal
 import re
-from mechanize import FormNotFoundError
 
-from weboob.tools.browser import BasePage, BrowserIncorrectPassword
+from weboob.tools.browser2.page import HTMLPage, ListElement, ItemElement, method, LoggedPage
+from weboob.tools.browser2.filters import Regexp, CleanText, CleanDecimal, Format, Link
+
 from weboob.capabilities.bank import Account
 from weboob.tools.capabilities.bank.transactions import FrenchTransaction
 
 
-__all__ = ['LoginPage', 'AccountsPage', 'TransactionsPage']
+__all__ = ['LoginPage', 'HomePage', 'TransactionsPage']
 
 
-class LoginPage(BasePage):
-    def redirect(self):
-        try:
-            self.browser.select_form(name='redirectEpargne')
-            self.browser.submit(nologin=True)
-        except FormNotFoundError:
-            raise BrowserIncorrectPassword()
+class LoginPage(HTMLPage):
+    def enter_login(self, username):
+        form = self.get_form(nr=0)
+        form['name'] = username
+        form.submit()
+
+    def enter_password(self, password):
+        form = self.get_form(nr=0)
+        form['pass'] = password
+        form.submit()
 
 
-class HomePage(BasePage):
-    pass
+class HomePage(LoggedPage, HTMLPage):
+    @method
+    class get_list(ListElement):
+        item_xpath = '//div[@class="three_contenu_table"]'
+
+        class item(ItemElement):
+            klass = Account
+
+            obj_id = Regexp(CleanText('./div[@class="carte_col_leftcol"]/p'), r'(\d+)')
+            obj_label = CleanText('./div[@class="carte_col_leftcol"]/h2')
+            obj_balance = CleanDecimal(Format('-%s', CleanText('.//div[@class="catre_col_one"]/h2')))
+            obj_currency = FrenchTransaction.Currency('.//div[@class="catre_col_one"]/h2')
+            obj__link = Link('.//a[contains(@href, "solde-dernieres-operations")]')
 
 
-class AccountsPage(BasePage):
-    def get_list(self):
-        div = self.document.xpath('//div[@id="descriptifdroite"]')[0]
-
-        account = Account()
-
-        account.id = re.search(u'(\d+)', div.xpath('.//div[@class="credithauttexte"]')[0].text).group(1)
-        account.label = u'Carte PASS'
-        account.balance = Decimal('0')
-
-        for tr in div.xpath('.//table/tr'):
-            tds = tr.findall('td')
-
-            if len(tds) < 3:
-                continue
-
-            label = u''.join([txt.strip() for txt in tds[1].itertext()])
-            value = u''.join([txt.strip() for txt in tds[2].itertext()])
-
-            if 'encours depuis le dernier' in label.lower():
-                coming = u'-' + value
-                account.coming = Decimal(FrenchTransaction.clean_amount(coming))
-                account.currency = account.get_currency(coming)
-            elif u'arrêté de compte' in label.lower():
-                m = re.search(u'(\d+)/(\d+)/(\d+)', label)
-                if m:
-                    account._outstanding_date = datetime.date(*reversed(map(int, m.groups())))
-                    break
-
-        yield account
+class Transaction(FrenchTransaction):
+    PATTERNS = [(re.compile(r'^(?P<text>.*?) (?P<dd>\d{2})/(?P<mm>\d{2})$'), FrenchTransaction.TYPE_CARD)]
 
 
-class TransactionsPage(BasePage):
-    COL_DATE = 0
-    COL_TEXT = 1
-    COL_AMOUNT = 2
+class TransactionsPage(LoggedPage, HTMLPage):
+    @method
+    class get_history(Transaction.TransactionsElement):
+        head_xpath = '//table[@id="creditHistory"]//thead/tr/th'
+        item_xpath = '//table[@id="creditHistory"]/tbody/tr'
 
-    def get_history(self, account):
-        transactions = []
-        last_order = None
-
-        for tr in self.document.split('\n')[1:]:
-            cols = tr.split(';')
-
-            if len(cols) < 4:
-                continue
-
-            t = FrenchTransaction(0)
-            date = cols[self.COL_DATE]
-            raw = cols[self.COL_TEXT]
-            amount = cols[self.COL_AMOUNT]
-
-            t.parse(date, re.sub(r'[ ]+', ' ', raw))
-
-            if t.raw.startswith('PRELEVEMENT ACHATS DIFFERES'):
-                t._coming = False
-                if last_order is None:
-                    last_order = t.date
-            else:
-                t._coming = True
-
-            t.set_amount(amount)
-            transactions.append(t)
-
-        # go to the previous stop date before the last order
-        while last_order is not None and last_order.day != account._outstanding_date.day:
-            last_order = last_order - datetime.timedelta(days=1)
-
-        for t in transactions:
-            if t.date <= last_order:
-                t._coming = False
-
-        return iter(transactions)
+        class item(Transaction.TransactionElement):
+            obj_id = None
+            obj_type = Transaction.TYPE_CARD