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

Support default values in CleanDecimal

Browse source
This commit is contained in:
Florent 2014-03-20 15:37:28 +01:00
commit eab0f51e29
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
weboob/tools/browser2/filters.py
View file

@ -21,7 +21,7 @@ from __future__ import absolute_import
from dateutil.parser import parse as parse_date from dateutil.parser import parse as parse_date
import datetime import datetime
from decimal import Decimal from decimal import Decimal, InvalidOperation
import re import re
from weboob.capabilities.base import empty from weboob.capabilities.base import empty
@ -156,16 +156,22 @@ class CleanDecimal(CleanText):
""" """
Get a cleaned Decimal value from an element. Get a cleaned Decimal value from an element.
""" """
def __init__(self, selector, replace_dots=True): def __init__(self, selector, replace_dots=True, default=_NO_DEFAULT):
super(CleanDecimal, self).__init__(selector) super(CleanDecimal, self).__init__(selector)
self.replace_dots = replace_dots self.replace_dots = replace_dots
self.default = default
def filter(self, text): def filter(self, text):
text = super(CleanDecimal, self).filter(text) text = super(CleanDecimal, self).filter(text)
if self.replace_dots: if self.replace_dots:
text = text.replace('.','').replace(',','.') text = text.replace('.','').replace(',','.')
return Decimal(re.sub(ur'[^\d\-\.]', '', text)) try:
return Decimal(re.sub(ur'[^\d\-\.]', '', text))
except InvalidOperation as e:
if self.default is not _NO_DEFAULT:
return Decimal(self.default)
else:
raise InvalidOperation(e)
class Attr(Filter): class Attr(Filter):
def __init__(self, selector, attr, default=_NO_DEFAULT): def __init__(self, selector, attr, default=_NO_DEFAULT):