From b91093a92c6ea4a3d7c7683b7443be4913b2afde Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Sat, 10 Jul 2010 02:28:57 +0200 Subject: [PATCH] code simplification --- weboob/core/ouiboube.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py index 3c7ed668..febdeffe 100644 --- a/weboob/core/ouiboube.py +++ b/weboob/core/ouiboube.py @@ -73,8 +73,8 @@ class Weboob(object): continue # Check conditions - if (not caps is None and not module.has_caps(caps)) or \ - (not names is None and not name in names): + if caps is not None and not module.has_caps(caps) or \ + names is not None and name not in names: continue try: @@ -89,14 +89,15 @@ class Weboob(object): loaded_backends = {} self.modules_loader.load() for name, module in self.modules_loader.modules.iteritems(): - if (caps is None or module.has_caps(caps)) and \ - (names is None or module.get_name() in names): - try: - name = module.get_name() - self.backends[name] = module.create_backend(self, name, {}, storage) - loaded_backends[name] = self.backends[name] - except Exception, e: - warning(u'Unable to load "%s" module as backend with no config: %s' % (name, e)) + if caps is not None and not module.has_caps(caps) or \ + names is not None and name not in names: + continue + try: + name = module.get_name() + self.backends[name] = module.create_backend(self, name, {}, storage) + loaded_backends[name] = self.backends[name] + except Exception, e: + warning(u'Unable to load "%s" module as backend with no config: %s' % (name, e)) return loaded_backends def iter_backends(self, caps=None):