From ae3471fdf766bf5f14a9f87e470d910baca2b2eb Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 19 Mar 2014 16:20:24 +0100 Subject: [PATCH] Rename Attr filter to Field --- modules/creditmutuel/pages.py | 4 ++-- modules/dresdenwetter/pages.py | 4 ++-- modules/sachsen/pages.py | 4 ++-- weboob/tools/browser2/filters.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/creditmutuel/pages.py b/modules/creditmutuel/pages.py index 1d5fe242..b39fcb7b 100644 --- a/modules/creditmutuel/pages.py +++ b/modules/creditmutuel/pages.py @@ -24,7 +24,7 @@ import re from dateutil.relativedelta import relativedelta 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.capabilities import NotAvailable from weboob.capabilities.bank import Account @@ -103,7 +103,7 @@ class AccountsPage(LoggedPage, HTMLPage): obj_currency = FrenchTransaction.Currency('./td[2] | ./td[3]') obj__link_id = Link('./td[1]/a') obj__card_links = [] - obj_type = Type(Attr('label')) + obj_type = Type(Field('label')) def parse(self, el): link = el.xpath('./td[1]/a')[0].get('href', '') diff --git a/modules/dresdenwetter/pages.py b/modules/dresdenwetter/pages.py index 2db90b31..3c366d41 100644 --- a/modules/dresdenwetter/pages.py +++ b/modules/dresdenwetter/pages.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . 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.base import NotAvailable @@ -36,7 +36,7 @@ class StartPage(HTMLPage): klass = GaugeSensor 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_lastvalue = Env('lastvalue') obj_gaugeid = u"wetter" diff --git a/modules/sachsen/pages.py b/modules/sachsen/pages.py index 7e6cea16..45f8b115 100644 --- a/modules/sachsen/pages.py +++ b/modules/sachsen/pages.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . 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.base import NotAvailable, NotLoaded @@ -48,7 +48,7 @@ class ListPage(HTMLPage): obj_id = CleanText(Env('id')) obj_name = CleanText(Env('name'), "'") - obj_city = Regexp(Attr('name'), '^([^\s]+).*') + obj_city = Regexp(Field('name'), '^([^\s]+).*') obj_object = Env('object') def parse(self, el): diff --git a/weboob/tools/browser2/filters.py b/weboob/tools/browser2/filters.py index 70bc909f..867af373 100644 --- a/weboob/tools/browser2/filters.py +++ b/weboob/tools/browser2/filters.py @@ -171,12 +171,12 @@ class Link(Filter): return el[0].attrib.get('href', '') -class Attr(_Filter): +class Field(_Filter): """ Get the attribute of object. """ def __init__(self, name): - super(Attr, self).__init__() + super(Field, self).__init__() self.name = name def __call__(self, item):