nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

store instance name in Backend

Browse source
This commit is contained in:
Romain Bignon 2010-04-04 18:57:07 +02:00
commit 4736260993
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
weboob/backend.py
View file

@ -44,8 +44,9 @@ class Backend:
class ConfigError(Exception): pass class ConfigError(Exception): pass
def __init__(self, weboob, config): def __init__(self, weboob, name, config):
self.weboob = weboob self.weboob = weboob
self.name = name
self.config = {} self.config = {}
for name, field in self.CONFIG.iteritems(): for name, field in self.CONFIG.iteritems():
value = config.get(name, field.default) value = config.get(name, field.default)

8
weboob/modules.py
View file

@ -49,8 +49,8 @@ class Module:
return True return True
return False return False
def create_backend(self, weboob, config): def create_backend(self, weboob, name, config):
return self.klass(weboob, config) return self.klass(weboob, name, config)
class ModulesLoader: class ModulesLoader:
def __init__(self): def __init__(self):
@ -94,7 +94,7 @@ class ModulesLoader:
continue continue
try: try:
backends[name] = module.create_backend(self, params) backends[name] = module.create_backend(self, name, params)
except Exception, e: except Exception, e:
warning('Unable to load %s backend: %s' % (name, 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 \ if (caps is None or module.has_caps(caps)) and \
(names is None or module.name in names): (names is None or module.name in names):
try: try:
backends[module.name] = module.create_backend(self, {}) backends[module.name] = module.create_backend(self, module.name, {})
except Exception, e: except Exception, e:
warning('Unable to load %s backend: %s' % (name, e)) warning('Unable to load %s backend: %s' % (name, e))
return backends return backends