diff --git a/weboob/ouiboube.py b/weboob/ouiboube.py index 2c5db1f10e0c6121e2f74b823af6da6c2804bccd..b5f0cb1a2cced35bf8b1897dc44d629bb95fca24 100644 --- a/weboob/ouiboube.py +++ b/weboob/ouiboube.py @@ -55,15 +55,12 @@ def load_module(self, modname, instname): module = self.modules_loader[modname] self.backends[instname] = module.create_backend(self) - def get_backends(self, caps=None): + def iter_backends(self, caps=None): if caps is None: - return self.backends - - d = {} - for name, backend in self.backends.iteritems(): - if backend.has_caps(caps): - d[name] = backend - return d + return self.backends.iteritems() + else: + return dict((name, backend) for name, backend in self.backends.iteritems() + if backend.has_caps(caps)).iteritems() def schedule(self, interval, function, *args): self.scheduler.enter(interval, 1, function, args) diff --git a/weboob2mail b/weboob2mail index 8a57e09040b2da527d06daeb4bc90143ef10be83..d6c3c9e20750735cea38f299cab51ffd9cdfd75d 100755 --- a/weboob2mail +++ b/weboob2mail @@ -57,9 +57,8 @@ class Application(BaseApplication): self.weboob.loop() def process(self): - backends = self.weboob.get_backends() - for name, b in backends.iteritems(): - for message in b.iter_new_messages(): + for name, backend in self.weboob.iter_backends(): + for message in backend.iter_new_messages(): self.send_email(name, message) def send_email(self, backend_name, mail):