Rename Attr filter to Field

This commit is contained in:
Florent 2014-03-19 16:20:24 +01:00
commit ae3471fdf7
4 changed files with 8 additions and 8 deletions

View file

@ -24,7 +24,7 @@ import re
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, SkipItem, FormNotFound from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, SkipItem, FormNotFound
from weboob.tools.browser2.filters import Filter, Env, CleanText, CleanDecimal, Link, Attr from weboob.tools.browser2.filters import Filter, Env, CleanText, CleanDecimal, Link, Field
from weboob.tools.browser import BrowserIncorrectPassword from weboob.tools.browser import BrowserIncorrectPassword
from weboob.capabilities import NotAvailable from weboob.capabilities import NotAvailable
from weboob.capabilities.bank import Account from weboob.capabilities.bank import Account
@ -103,7 +103,7 @@ class AccountsPage(LoggedPage, HTMLPage):
obj_currency = FrenchTransaction.Currency('./td[2] | ./td[3]') obj_currency = FrenchTransaction.Currency('./td[2] | ./td[3]')
obj__link_id = Link('./td[1]/a') obj__link_id = Link('./td[1]/a')
obj__card_links = [] obj__card_links = []
obj_type = Type(Attr('label')) obj_type = Type(Field('label'))
def parse(self, el): def parse(self, el):
link = el.xpath('./td[1]/a')[0].get('href', '') link = el.xpath('./td[1]/a')[0].get('href', '')

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 weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement
from weboob.tools.browser2.filters import CleanText, Env, Regexp, Attr from weboob.tools.browser2.filters import CleanText, Env, Regexp, Field
from weboob.capabilities.gauge import GaugeMeasure, GaugeSensor from weboob.capabilities.gauge import GaugeMeasure, GaugeSensor
from weboob.capabilities.base import NotAvailable from weboob.capabilities.base import NotAvailable
@ -36,7 +36,7 @@ class StartPage(HTMLPage):
klass = GaugeSensor klass = GaugeSensor
obj_name = Regexp(CleanText('.'), '(.*?) {0,}: .*', "\\1") obj_name = Regexp(CleanText('.'), '(.*?) {0,}: .*', "\\1")
obj_id = CleanText(Regexp(Attr('name'), '(.*)', "dd-\\1"), " .():") obj_id = CleanText(Regexp(Field('name'), '(.*)', "dd-\\1"), " .():")
obj_unit = Env('unit') obj_unit = Env('unit')
obj_lastvalue = Env('lastvalue') obj_lastvalue = Env('lastvalue')
obj_gaugeid = u"wetter" obj_gaugeid = u"wetter"

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 weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement
from weboob.tools.browser2.filters import Env, CleanText, Regexp, Attr, Date, Map from weboob.tools.browser2.filters import Env, CleanText, Regexp, Field, Date, Map
from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor
from weboob.capabilities.base import NotAvailable, NotLoaded from weboob.capabilities.base import NotAvailable, NotLoaded
@ -48,7 +48,7 @@ class ListPage(HTMLPage):
obj_id = CleanText(Env('id')) obj_id = CleanText(Env('id'))
obj_name = CleanText(Env('name'), "'") obj_name = CleanText(Env('name'), "'")
obj_city = Regexp(Attr('name'), '^([^\s]+).*') obj_city = Regexp(Field('name'), '^([^\s]+).*')
obj_object = Env('object') obj_object = Env('object')
def parse(self, el): def parse(self, el):

View file

@ -171,12 +171,12 @@ class Link(Filter):
return el[0].attrib.get('href', '') return el[0].attrib.get('href', '')
class Attr(_Filter): class Field(_Filter):
""" """
Get the attribute of object. Get the attribute of object.
""" """
def __init__(self, name): def __init__(self, name):
super(Attr, self).__init__() super(Field, self).__init__()
self.name = name self.name = name
def __call__(self, item): def __call__(self, item):