From 473626099346658f627e8a6aa9051c1e7c0434b8 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sun, 4 Apr 2010 18:57:07 +0200 Subject: [PATCH] store instance name in Backend --- weboob/backend.py | 3 ++- weboob/modules.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/weboob/backend.py b/weboob/backend.py index f1b18532..81d7780e 100644 --- a/weboob/backend.py +++ b/weboob/backend.py @@ -44,8 +44,9 @@ class Backend: class ConfigError(Exception): pass - def __init__(self, weboob, config): + def __init__(self, weboob, name, config): self.weboob = weboob + self.name = name self.config = {} for name, field in self.CONFIG.iteritems(): value = config.get(name, field.default) diff --git a/weboob/modules.py b/weboob/modules.py index fe821aea..8feb53b7 100644 --- a/weboob/modules.py +++ b/weboob/modules.py @@ -49,8 +49,8 @@ class Module: return True return False - def create_backend(self, weboob, config): - return self.klass(weboob, config) + def create_backend(self, weboob, name, config): + return self.klass(weboob, name, config) class ModulesLoader: def __init__(self): @@ -94,7 +94,7 @@ class ModulesLoader: continue try: - backends[name] = module.create_backend(self, params) + backends[name] = module.create_backend(self, name, params) except Exception, e: warning('Unable to load %s backend: %s' % (name, e)) @@ -106,7 +106,7 @@ class ModulesLoader: if (caps is None or module.has_caps(caps)) and \ (names is None or module.name in names): try: - backends[module.name] = module.create_backend(self, {}) + backends[module.name] = module.create_backend(self, module.name, {}) except Exception, e: warning('Unable to load %s backend: %s' % (name, e)) return backends