diff --git a/weboob/backend.py b/weboob/backend.py index 0b2908b7..de86f76b 100644 --- a/weboob/backend.py +++ b/weboob/backend.py @@ -54,10 +54,10 @@ class Backend(object): value = config.get(name, field.default) 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)): - 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 isinstance(field.default, bool): diff --git a/weboob/modules.py b/weboob/modules.py index a73f3d99..44204c81 100644 --- a/weboob/modules.py +++ b/weboob/modules.py @@ -94,7 +94,7 @@ class BackendsConfig: try: yield name, params.pop('_type'), params except KeyError: - warning("Missing field '_type' for backend '%s'", name) + warning('Missing field "_type" for backend "%s"', name) continue def add_backend(self, name, _type, params): @@ -130,10 +130,10 @@ class ModulesLoader: try: module = Module(name, __import__(name, fromlist=[name])) except ImportError, e: - warning('Unable to load module %s: %s' % (name, e)) + warning('Unable to load module "%s": %s' % (name, e)) return if name in self.modules: warning('Module "%s" is already loaded (%s)' % self.modules[name].module) return self.modules[module.get_name()] = module - debug('Loaded module %s (%s)' % (name, module.module.__name__)) + debug('Loaded module "%s" (%s)' % (name, module.module.__name__)) diff --git a/weboob/ouiboube.py b/weboob/ouiboube.py index 4e279406..77a6643a 100644 --- a/weboob/ouiboube.py +++ b/weboob/ouiboube.py @@ -42,7 +42,7 @@ class Weboob: if not os.path.exists(self.workdir): os.mkdir(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 self.modules_loader = ModulesLoader() @@ -60,7 +60,7 @@ class Weboob: try: module = self.modules_loader.modules[_type] except KeyError: - warning('Unable to find module %s', name) + warning('Unable to find module "%s" for backend "%s"' % (_type, name)) continue # Check conditions @@ -71,7 +71,7 @@ class Weboob: try: self.backends[name] = module.create_backend(self, name, params) 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 @@ -82,7 +82,7 @@ class Weboob: try: self.backends[module.name] = module.create_backend(self, module.name, {}) 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 def iter_backends(self, caps=None):