nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

do not use locale.setlocale to parse amount

Browse source
This commit is contained in:
Romain Bignon 2015-02-26 14:10:39 +01:00
commit e7cec07750
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/paypal/newpages.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright(C) 2014 Budget Insight # Copyright(C) 2014-2015 Budget Insight
# #
# This file is part of weboob. # This file is part of weboob.
# #
@ -18,7 +18,6 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
import re import re
import locale
from decimal import Decimal from decimal import Decimal
from weboob.deprecated.browser import Page from weboob.deprecated.browser import Page
@ -104,22 +103,19 @@ class NewPartHistoryPage(Page):
def parse_transaction(self, transaction): def parse_transaction(self, transaction):
t = FrenchTransaction(transaction['activityId']) t = FrenchTransaction(transaction['activityId'])
date = parse_french_date(transaction['date']) date = parse_french_date(transaction['date'])
try: raw = transaction.get('counterparty', transaction['displayType'])
raw = transaction['counterparty']
except KeyError:
raw = transaction['displayType']
t.parse(date=date, raw=raw) t.parse(date=date, raw=raw)
try: try:
m = re.search("\D", transaction['netAmount'][::-1]) m = re.search(r"\D", transaction['netAmount'][::-1])
amount = Decimal(transaction['amount'])/Decimal((10 ** m.start())) amount = Decimal(re.sub(r'[^\d]', '', transaction['netAmount']))/Decimal((10 ** m.start()))
locale.setlocale(locale.LC_ALL, '')
amount = locale.format('%.2f', amount)
except KeyError: except KeyError:
return return
if transaction['isCredit']: if transaction['isCredit']:
t.set_amount(credit=amount) t.amount = abs(amount)
else: else:
t.set_amount(debit=amount) t.amount = - abs(amount)
t._currency = transaction['currencyCode'] t._currency = transaction['currencyCode']
return t return t