diff --git a/modules/dresdenwetter/backend.py b/modules/dresdenwetter/backend.py index 1cd2de18a333e7640e8e878435fddfff382ffb48..9785c08fe20ed89eda769a310d0544743e30d4e7 100644 --- a/modules/dresdenwetter/backend.py +++ b/modules/dresdenwetter/backend.py @@ -21,7 +21,7 @@ from .browser import DresdenWetterBrowser from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge,\ SensorNotFound -from weboob.capabilities.base import find_id_list +from weboob.capabilities.base import find_object from weboob.tools.backend import BaseBackend @@ -56,7 +56,7 @@ def _get_sensor_by_id(self, id): def iter_sensors(self, gauge, pattern=None): if not isinstance(gauge, Gauge): - gauge = find_id_list(self.iter_gauges(), gauge, error=SensorNotFound) + gauge = find_object(self.iter_gauges(), gauge, error=SensorNotFound) if pattern is None: for sensor in gauge.sensors: yield sensor diff --git a/modules/ing/backend.py b/modules/ing/backend.py index fe75c839a8547720881f1610a8d9f865d9da173e..92076d3c7939f72f581af1e5048515e26afadadc 100644 --- a/modules/ing/backend.py +++ b/modules/ing/backend.py @@ -22,7 +22,7 @@ Account, Recipient from weboob.capabilities.bill import ICapBill, Bill, Subscription,\ SubscriptionNotFound, BillNotFound -from weboob.capabilities.base import UserError, find_id_list +from weboob.capabilities.base import UserError, find_object from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -68,7 +68,7 @@ def iter_accounts(self): return self.browser.get_accounts_list() def get_account(self, _id): - return find_id_list(self.browser.get_accounts_list(), _id, error=AccountNotFound) + return find_object(self.browser.get_accounts_list(), _id, error=AccountNotFound) def iter_history(self, account): if not isinstance(account, Account): @@ -100,11 +100,11 @@ def iter_subscription(self): return self.browser.get_subscriptions() def get_subscription(self, _id): - return find_id_list(self.browser.get_subscriptions(), _id, error=SubscriptionNotFound) + return find_object(self.browser.get_subscriptions(), _id, error=SubscriptionNotFound) def get_bill(self, id): subscription = self.get_subscription(id.split('-')[0]) - return find_id_list(self.browser.get_bills(subscription), id, error=BillNotFound) + return find_object(self.browser.get_bills(subscription), id, error=BillNotFound) def iter_bills(self, subscription): if not isinstance(subscription, Subscription): diff --git a/modules/poivy/backend.py b/modules/poivy/backend.py index 29ed824cb35693e429746fb7b189814bdbb3a8cf..87638ca82532e79d12411ebec5c765265d51756a 100644 --- a/modules/poivy/backend.py +++ b/modules/poivy/backend.py @@ -19,7 +19,7 @@ from weboob.capabilities.bill import ICapBill, Subscription, SubscriptionNotFound, Detail -from weboob.capabilities.base import find_id_list +from weboob.capabilities.base import find_object from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -52,7 +52,7 @@ def iter_subscription(self): return self.browser.get_subscription_list() def get_subscription(self, _id): - return find_id_list(self.iter_subscription(), _id, error=SubscriptionNotFound) + return find_object(self.iter_subscription(), _id, error=SubscriptionNotFound) def iter_bills_history(self, subscription): # Try if we have a real subscription before to load the history diff --git a/modules/sachsen/backend.py b/modules/sachsen/backend.py index 4c87c0f7176ebdb06a283bd707c8f0e1d4f53e7e..d2840609d827f90a03aae907d7be30f52d5e7390 100644 --- a/modules/sachsen/backend.py +++ b/modules/sachsen/backend.py @@ -20,7 +20,7 @@ from .browser import SachsenBrowser from weboob.capabilities.gauge import ICapGauge, GaugeSensor, Gauge,\ SensorNotFound -from weboob.capabilities.base import find_id_list +from weboob.capabilities.base import find_object from weboob.tools.backend import BaseBackend @@ -56,7 +56,7 @@ def _get_sensor_by_id(self, id): def iter_sensors(self, gauge, pattern=None): if not isinstance(gauge, Gauge): - gauge = find_id_list(self.browser.get_rivers_list(), gauge, error=SensorNotFound) + gauge = find_object(self.browser.get_rivers_list(), gauge, error=SensorNotFound) if pattern is None: for sensor in gauge.sensors: yield sensor diff --git a/weboob/capabilities/base.py b/weboob/capabilities/base.py index e0c6886f76f083ab1a24075b0d73aa7531683e8c..edd145a686857bf0944ff6c18511c28f6fc99f3d 100644 --- a/weboob/capabilities/base.py +++ b/weboob/capabilities/base.py @@ -46,7 +46,7 @@ def empty(value): return True return False -def find_id_list(mylist, _id, error=None): +def find_object(mylist, _id, error=None): """ Very simple tools to return an object with the matching _id """