use properties for setters

This commit is contained in:
Christophe Benz 2010-06-22 15:57:14 +02:00
commit af3ebade90
6 changed files with 141 additions and 84 deletions

View file

@ -1,26 +1,28 @@
# -*- coding: utf-8 -*-
"""
Copyright(C) 2009-2010 Romain Bignon
# Copyright(C) 2009-2010 Romain Bignon
#
# 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
# the Free Software Foundation, version 3 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
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
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""
from weboob.tools.browser import BasePage
from weboob.capabilities.bank import Operation
__all__ = ['AccountComing']
class AccountComing(BasePage):
def on_loaded(self):
@ -39,12 +41,12 @@ class AccountComing(BasePage):
if child.tail: label += child.tail
if tds[1].tail: label += tds[1].tail
label = label.strip()
amount = tds[2].text.replace('.','').replace(',','.')
amount = tds[2].text.replace('.', '').replace(',', '.')
operation = Operation()
operation.setDate(date)
operation.setLabel(label)
operation.setAmount(float(amount))
operation.date = date
operation.label = label
operation.amount = float(amount)
self.operations.append(operation)
def get_operations(self):

View file

@ -37,11 +37,11 @@ class AccountsList(BasePage):
for td in tr.getiterator('td'):
if td.attrib.get('headers', '').startswith('Numero_'):
id = td.text
account.setID(long(''.join(id.split(' '))))
account.id = ''.join(id.split(' '))
elif td.attrib.get('headers', '').startswith('Libelle_'):
a = td.findall('a')
label = unicode(a[0].text)
account.setLabel(label)
account.label = label
m = self.LINKID_REGEXP.match(a[0].attrib.get('href', ''))
if m:
account.setLinkID(m.group(1))
@ -49,7 +49,7 @@ class AccountsList(BasePage):
a = td.findall('a')
balance = a[0].text
balance = balance.replace('.','').replace(',','.')
account.setBalance(float(balance))
account.balance = float(balance)
elif td.attrib.get('headers', '').startswith('Avenir'):
a = td.findall('a')
coming = a[0].text

View file

@ -30,8 +30,8 @@ class AccountsList(CragrBasePage):
for div in self.document.getiterator('div'):
if div.attrib.get('class', '') == 'dv' and div.getchildren()[0].tag == 'br':
account = Account()
account.setLabel(div.find('a').text.strip())
account.setID(long(div.findall('br')[1].tail.strip()))
account.label = div.find('a').text.strip()
account.id = div.findall('br')[1].tail.strip()
s = div.find('div').find('span').find('b').text
balance = u''
for c in s:
@ -39,6 +39,6 @@ class AccountsList(CragrBasePage):
balance += c
if c == ',':
balance += '.'
account.setBalance(float(balance))
account.balance = float(balance)
l.append(account)
return l