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

enhance user console messages, and always use double quotes

Browse source
This commit is contained in:
Christophe Benz 2010-04-08 18:27:08 +02:00
commit b29a3f223f
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
weboob/backend.py
View file

@ -54,10 +54,10 @@ class Backend(object):
value = config.get(name, field.default) value = config.get(name, field.default)
if value is None: if value is None:
raise Backend.ConfigError("Missing parameter '%s' (%s)" % (name, field.description)) raise Backend.ConfigError('Missing parameter "%s" (%s)' % (name, field.description))
if field.regexp and re.match(field.regexp, str(value)): if field.regexp and re.match(field.regexp, str(value)):
raise Backend.ConfigError("Value of '%s' does not match regexp '%s'" % (name, field.regexp)) raise Backend.ConfigError('Value of "%s" does not match regexp "%s"' % (name, field.regexp))
if not field.default is None: if not field.default is None:
if isinstance(field.default, bool): if isinstance(field.default, bool):

6
weboob/modules.py
View file

@ -94,7 +94,7 @@ class BackendsConfig:
try: try:
yield name, params.pop('_type'), params yield name, params.pop('_type'), params
except KeyError: except KeyError:
warning("Missing field '_type' for backend '%s'", name) warning('Missing field "_type" for backend "%s"', name)
continue continue
def add_backend(self, name, _type, params): def add_backend(self, name, _type, params):
@ -130,10 +130,10 @@ class ModulesLoader:
try: try:
module = Module(name, __import__(name, fromlist=[name])) module = Module(name, __import__(name, fromlist=[name]))
except ImportError, e: except ImportError, e:
warning('Unable to load module %s: %s' % (name, e)) warning('Unable to load module "%s": %s' % (name, e))
return return
if name in self.modules: if name in self.modules:
warning('Module "%s" is already loaded (%s)' % self.modules[name].module) warning('Module "%s" is already loaded (%s)' % self.modules[name].module)
return return
self.modules[module.get_name()] = module self.modules[module.get_name()] = module
debug('Loaded module %s (%s)' % (name, module.module.__name__)) debug('Loaded module "%s" (%s)' % (name, module.module.__name__))

8
weboob/ouiboube.py
View file

@ -42,7 +42,7 @@ class Weboob:
if not os.path.exists(self.workdir): if not os.path.exists(self.workdir):
os.mkdir(self.workdir) os.mkdir(self.workdir)
elif not os.path.isdir(self.workdir): elif not os.path.isdir(self.workdir):
warning("'%s' is not a directory" % self.workdir) warning('"%s" is not a directory' % self.workdir)
# Modules loader # Modules loader
self.modules_loader = ModulesLoader() self.modules_loader = ModulesLoader()
@ -60,7 +60,7 @@ class Weboob:
try: try:
module = self.modules_loader.modules[_type] module = self.modules_loader.modules[_type]
except KeyError: except KeyError:
warning('Unable to find module %s', name) warning('Unable to find module "%s" for backend "%s"' % (_type, name))
continue continue
# Check conditions # Check conditions
@ -71,7 +71,7 @@ class Weboob:
try: try:
self.backends[name] = module.create_backend(self, name, params) self.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. filename=%s' % (name, e, self.backends_config.confpath))
return self.backends return self.backends
@ -82,7 +82,7 @@ class Weboob:
try: try:
self.backends[module.name] = module.create_backend(self, module.name, {}) 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" module as backend with no config: %s' % (name, e))
return self.backends return self.backends
def iter_backends(self, caps=None): def iter_backends(self, caps=None):