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

able to set None as default value on filters

Browse source
This commit is contained in:
Romain Bignon 2014-03-14 00:17:27 +01:00
commit 16742dc9aa
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,9 @@ from decimal import Decimal
import re import re
_NO_DEFAULT = object()
class _Filter(object): class _Filter(object):
_creation_counter = 0 _creation_counter = 0
@ -102,7 +105,7 @@ class TableCell(_Filter):
def __init__(self, *names, **kwargs): def __init__(self, *names, **kwargs):
super(TableCell, self).__init__() super(TableCell, self).__init__()
self.names = names self.names = names
self.default = kwargs.pop('default', None) self.default = kwargs.pop('default', _NO_DEFAULT)
def __call__(self, item): def __call__(self, item):
for name in self.names: for name in self.names:
@ -110,7 +113,7 @@ class TableCell(_Filter):
if idx is not None: if idx is not None:
return item.xpath('./td[%s]' % (idx + 1)) return item.xpath('./td[%s]' % (idx + 1))
if self.default is not None: if self.default is not _NO_DEFAULT:
return self.default return self.default
raise KeyError('Unable to find column %s' % ' or '.join(self.names)) raise KeyError('Unable to find column %s' % ' or '.join(self.names))
@ -175,7 +178,7 @@ class Regexp(Filter):
>>> f(etree.fromstring('<html><body><p>Date: <span>13/08/1988</span></p></body></html>')) >>> f(etree.fromstring('<html><body><p>Date: <span>13/08/1988</span></p></body></html>'))
u'1988-08-13' u'1988-08-13'
""" """
def __init__(self, selector, pattern, template=None, flags=0, default=None): def __init__(self, selector, pattern, template=None, flags=0, default=_NO_DEFAULT):
super(Regexp, self).__init__(selector) super(Regexp, self).__init__(selector)
self.pattern = pattern self.pattern = pattern
self.regex = re.compile(pattern, flags) self.regex = re.compile(pattern, flags)
@ -188,7 +191,7 @@ class Regexp(Filter):
mobj = self.regex.search(txt) mobj = self.regex.search(txt)
if not mobj: if not mobj:
if self.default is not None: if self.default is not _NO_DEFAULT:
return self.default return self.default
else: else:
raise KeyError('Unable to match %s' % self.pattern) raise KeyError('Unable to match %s' % self.pattern)