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

fix crash when Account.coming or Account.balance are unavailable

Browse source
This commit is contained in:
Romain Bignon 2013-07-27 18:48:32 +02:00
commit 8b803e7c39
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
weboob/applications/boobank/boobank.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from datetime import date import datetime
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from dateutil.parser import parse as parse_date from dateutil.parser import parse as parse_date
from decimal import Decimal, InvalidOperation from decimal import Decimal, InvalidOperation
@ -99,7 +99,7 @@ class TransactionsFormatter(IFormatter):
return ' %s %s %s %s' % (self.colored('%-10s' % date, 'blue'), return ' %s %s %s %s' % (self.colored('%-10s' % date, 'blue'),
self.colored('%-12s' % _type[:12], 'magenta'), self.colored('%-12s' % _type[:12], 'magenta'),
self.colored('%-50s' % label[:50], 'yellow'), self.colored('%-50s' % label[:50], 'yellow'),
self.colored('%10.2f' % obj.amount, 'green' if amount >= 0 else 'red')) self.colored('%10.2f' % amount, 'green' if amount >= 0 else 'red'))
class TransferFormatter(IFormatter): class TransferFormatter(IFormatter):
@ -179,8 +179,8 @@ class AccountListFormatter(IFormatter):
coming = obj.coming or Decimal('0') coming = obj.coming or Decimal('0')
result = u'%s %s %s %s' % (id, result = u'%s %s %s %s' % (id,
self.colored('%-25s' % obj.label, 'yellow'), self.colored('%-25s' % obj.label, 'yellow'),
self.colored('%9.2f' % obj.balance, 'green' if balance >= 0 else 'red'), self.colored('%9.2f' % obj.balance, 'green' if balance >= 0 else 'red') if not empty(obj.balance) else ' ' * 9,
self.colored('%9.2f' % obj.coming, 'green' if coming >= 0 else 'red')) self.colored('%9.2f' % obj.coming, 'green' if coming >= 0 else 'red') if not empty(obj.coming) else '')
self.tot_balance += balance self.tot_balance += balance
self.tot_coming += coming self.tot_coming += coming
@ -250,7 +250,8 @@ class Boobank(ReplApplication):
try: try:
end_date = parse_date(end_date) end_date = parse_date(end_date)
except ValueError: except ValueError:
print >>sys.stderr, '"%s" is an incorrect date format (for example %s)' % (end_date, (date.today() - relativedelta(months=1)).strftime('%Y-%m-%d')) print >>sys.stderr, '"%s" is an incorrect date format (for example %s)' % \
(end_date, (datetime.date.today() - relativedelta(months=1)).strftime('%Y-%m-%d'))
return 3 return 3
old_count = self.options.count old_count = self.options.count
self.options.count = None self.options.count = None