From ef16a5b7268d181d97f6823cafc171e08390ea5d Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@peerfuse.org>
Date: Sun, 15 Jan 2012 16:15:37 +0100
Subject: [PATCH] fixes in CMB, update AUTHORS

---
 AUTHORS                        |  6 +++---
 weboob/backends/cmb/backend.py | 25 +++++++++++++------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 082ff89c..2741e508 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,6 +33,9 @@ Noe Rubinstein <noe.rubinstein@gmail.com>
         * Bototo, Eatmanga, MangaFox, MangaHere, MangaReader, Mangatoshokan
           and Simplyreadit backends maintainer.
 
+Johann Broudin <johann.broudin@6-8.fr>
+        * CMB, FranceInter and LeMouv backends maintainer.
+
 Pierre Mazière <pierre.maziere@gmail.com>
         * LCL backend maintainer;
         * BNPorc fixes.
@@ -40,9 +43,6 @@ Pierre Mazière <pierre.maziere@gmail.com>
 Xavier Guerrin <xavier@tuxfamily.org>
         * CrAgr backend maintainer.
 
-Johann Broudin <johann.broudin@6-8.fr>
-        * FranceInter and LeMouv backends maintainer.
-
 Roger Philibert <roger.philibert@gmail.com>
         * Ehentai, Izneo and Youjizz backends maintainer.
 
diff --git a/weboob/backends/cmb/backend.py b/weboob/backends/cmb/backend.py
index 8cb432ef..7a59e03c 100644
--- a/weboob/backends/cmb/backend.py
+++ b/weboob/backends/cmb/backend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright(C) 2011 Johann Broudin
+# Copyright(C) 2012 Johann Broudin
 #
 # This file is part of weboob.
 #
@@ -43,13 +43,13 @@ class CmbBackend(BaseBackend, ICapBank):
     NAME = 'cmb'
     MAINTAINER = 'Johann Broudin'
     EMAIL = 'Johann.Broudin@6-8.fr'
-    VERSION = '0.2'
+    VERSION = '0.a'
     LICENSE = 'AGPLv3+'
     DESCRIPTION = 'Credit Mutuel de Bretagne'
     CONFIG = BackendConfig(
             ValueBackendPassword('login', label='Account ID', masked=False),
             ValueBackendPassword('password', label='Password', masked=True))
-    connected = False
+    cookie = None
     headers = {
             'User-Agent':
                 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OSX; en-us) ' +
@@ -74,15 +74,13 @@ class CmbBackend(BaseBackend, ICapBank):
         if response.status == 302:
             self.cookie = response.getheader('Set-Cookie').split(';')[0]
             self.cookie += ';'
-            self.connected = True
             return True
         else:
             raise BrowserIncorrectPassword()
         return false
 
     def iter_accounts(self):
-
-        if not self.connected:
+        if not self.cookie:
             self.login()
 
         def do_http():
@@ -95,9 +93,9 @@ class CmbBackend(BaseBackend, ICapBank):
                          headers)
             response = conn.getresponse()
             data = response.read()
-            conn.close
+            conn.close()
             return data
-        
+
         data = do_http()
         parser = etree.HTMLParser()
         tree = etree.parse(StringIO(data), parser)
@@ -121,7 +119,7 @@ class CmbBackend(BaseBackend, ICapBank):
             if tr.get('class') != 'LnTit' and tr.get('class') != 'LnTot':
                 account = Account()
                 td = tr.xpath('td')
-                
+
                 a = td[0].xpath('a')
                 account.label = unicode(a[0].text).strip()
                 href = a[0].get('href')
@@ -155,6 +153,9 @@ class CmbBackend(BaseBackend, ICapBank):
         raise AccountNotFound()
 
     def iter_history(self, account):
+        if not self.cookie:
+            self.login()
+
         page = "/domiweb/prive/particulier/releve/"
         if account.cmbtype == 'D':
             page += "10-releve.act"
@@ -179,8 +180,8 @@ class CmbBackend(BaseBackend, ICapBank):
         data = do_http()
         parser = etree.HTMLParser()
         tree = etree.parse(StringIO(data), parser)
-        
-        
+
+
         tables = tree.xpath('/html/body/table')
         if len(tables) == 0:
             title = tree.xpath('/html/head/title')[0].text
@@ -214,7 +215,7 @@ class CmbBackend(BaseBackend, ICapBank):
                     div = td[2].xpath('div')
                     label = div[0].xpath('a')[0].text.replace('\n','')
                     operation.label = unicode(' '.join(label.split()))
-                    
+
                     amount = td[3].text
                     if amount.count(',') != 1:
                         amount = td[4].text