From 34db067da465ecdf71bffa71587a380374ff5608 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Mon, 7 Mar 2011 10:53:57 +0100 Subject: [PATCH] fix indent --- weboob/backends/lcl/backend.py | 8 +-- weboob/backends/lcl/browser.py | 8 +-- weboob/backends/lcl/pages.py | 90 +++++++++++++++++----------------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/weboob/backends/lcl/backend.py b/weboob/backends/lcl/backend.py index 416fe2a2..14d57bd2 100644 --- a/weboob/backends/lcl/backend.py +++ b/weboob/backends/lcl/backend.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2010 Romain Bignon +# Copyright(C) 2010-2011 Romain Bignon, Pierre Mazière # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -58,7 +58,7 @@ class LCLBackend(BaseBackend, ICapBank): return iter([]) def iter_history(self, account): - with self.browser: - for history in self.browser.get_history(account): - yield history + with self.browser: + for history in self.browser.get_history(account): + yield history diff --git a/weboob/backends/lcl/browser.py b/weboob/backends/lcl/browser.py index bf2b1479..b23ad573 100644 --- a/weboob/backends/lcl/browser.py +++ b/weboob/backends/lcl/browser.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2010 Romain Bignon +# Copyright(C) 2010-2011 Romain Bignon, Pierre Mazière # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -75,9 +75,9 @@ class LCLBrowser(BaseBrowser): return None def get_history(self,account): - if not self.is_on_page(AccountHistoryPage) : - self.location('%s://%s%s' % (self.PROTOCOL, self.DOMAIN, account.link_id)) - return self.page.get_operations() + if not self.is_on_page(AccountHistoryPage) : + self.location('%s://%s%s' % (self.PROTOCOL, self.DOMAIN, account.link_id)) + return self.page.get_operations() #def get_coming_operations(self, account): # if not self.is_on_page(AccountComing) or self.page.account.id != account.id: diff --git a/weboob/backends/lcl/pages.py b/weboob/backends/lcl/pages.py index b81b04c9..1faba688 100644 --- a/weboob/backends/lcl/pages.py +++ b/weboob/backends/lcl/pages.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2010 Romain Bignon +# Copyright(C) 2010-2011 Romain Bignon, Pierre Mazière # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,53 +38,53 @@ class FramePage(BasePage): class AccountsPage(BasePage): def get_list(self): - l = [] - for div in self.document.getiterator('div'): - if div.attrib.get('class')=="unCompte-CC" : - account = Account() - account.id = div.attrib.get('id').replace('-','') - for td in div.getiterator('td'): - if td.find("div") is not None and td.find("div").attrib.get('class') == 'libelleCompte': - account.label = td.find("div").text - elif td.find('a') is not None and td.find('a').attrib.get('class') is None: - balance = td.find('a').text.replace(u"\u00A0",'').replace('.','').replace('+','').replace(',','.') - account.balance = float(balance) - account.link_id = td.find('a').attrib.get('href') + l = [] + for div in self.document.getiterator('div'): + if div.attrib.get('class')=="unCompte-CC" : + account = Account() + account.id = div.attrib.get('id').replace('-','') + for td in div.getiterator('td'): + if td.find("div") is not None and td.find("div").attrib.get('class') == 'libelleCompte': + account.label = td.find("div").text + elif td.find('a') is not None and td.find('a').attrib.get('class') is None: + balance = td.find('a').text.replace(u"\u00A0",'').replace('.','').replace('+','').replace(',','.') + account.balance = float(balance) + account.link_id = td.find('a').attrib.get('href') - l.append(account) + l.append(account) - return l + return l class AccountHistoryPage(BasePage): - def on_loaded(self): - self.operations = [] - done=False - for table in self.document.getiterator('table'): - title_tr=table.find('tr') - if title_tr is None: - continue - for text in title_tr.itertext(): - prefix='Opérations effectuées' - if text.startswith(prefix.decode('utf-8')): - for tr in table.iter('tr'): - tr_class=tr.attrib.get('class') - if tr_class == 'tbl1' or tr_class=='tbl2': - tds=tr.findall('td') - d=date(*reversed([int(x) for x in tds[0].text.split('/')])) - label=u''+tds[1].find('a').text.strip() - if tds[3].text.strip() != u"": - amount = - float(tds[3].text.strip().replace('.','').replace(',','.').replace(u"\u00A0",'').replace(' ','')) - else: - amount= float(tds[4].text.strip().replace('.','').replace(',','.').replace(u"\u00A0",'').replace(' ','')) - operation=Operation(len(self.operations)) - operation.date=d - operation.label=label - operation.amount=amount - self.operations.append(operation) - done=True - break - if done: - break + def on_loaded(self): + self.operations = [] + done=False + for table in self.document.getiterator('table'): + title_tr=table.find('tr') + if title_tr is None: + continue + for text in title_tr.itertext(): + prefix='Opérations effectuées' + if text.startswith(prefix.decode('utf-8')): + for tr in table.iter('tr'): + tr_class=tr.attrib.get('class') + if tr_class == 'tbl1' or tr_class=='tbl2': + tds=tr.findall('td') + d=date(*reversed([int(x) for x in tds[0].text.split('/')])) + label=u''+tds[1].find('a').text.strip() + if tds[3].text.strip() != u"": + amount = - float(tds[3].text.strip().replace('.','').replace(',','.').replace(u"\u00A0",'').replace(' ','')) + else: + amount= float(tds[4].text.strip().replace('.','').replace(',','.').replace(u"\u00A0",'').replace(' ','')) + operation=Operation(len(self.operations)) + operation.date=d + operation.label=label + operation.amount=amount + self.operations.append(operation) + done=True + break + if done: + break def get_operations(self): - return self.operations + return self.operations