From a4dd17631fe67a5cbf297130806cce36846e261b Mon Sep 17 00:00:00 2001
From: Christophe Benz <christophe.benz@gmail.com>
Date: Thu, 11 Mar 2010 15:29:30 +0100
Subject: [PATCH] use iterator instead of get_backends

---
 weboob/ouiboube.py | 13 +++++--------
 weboob2mail        |  5 ++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/weboob/ouiboube.py b/weboob/ouiboube.py
index 2c5db1f10e..b5f0cb1a2c 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 8a57e09040..d6c3c9e207 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):
-- 
GitLab