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

fix error message when the value isn't in the choices list

Browse source
This commit is contained in:
Romain Bignon 2010-08-13 11:18:55 +02:00
commit 85100e4c3a
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
weboob/tools/backend.py
View file

@ -92,7 +92,7 @@ class BaseBackend(object):
self.is_masked = is_masked self.is_masked = is_masked
self.regexp = regexp self.regexp = regexp
self.description = description self.description = description
self.choices=None self.choices = choices
class ConfigError(Exception): pass class ConfigError(Exception): pass
@ -132,12 +132,13 @@ class BaseBackend(object):
elif isinstance(field.default, float) and not isinstance(value, float): elif isinstance(field.default, float) and not isinstance(value, float):
value = float(value) value = float(value)
print value, field.choices
if field.choices: if field.choices:
if (isinstance(field.choices, (tuple,list)) and not value in field.choices) or \ if (isinstance(field.choices, (tuple,list)) and not value in field.choices) or \
(isinstance(field.choices, dict) and not value in field.choices.iterkeys()): (isinstance(field.choices, dict) and not value in field.choices.iterkeys()):
raise BaseBackend.ConfigError('Value of "%s" might be in this list: %s' % raise BaseBackend.ConfigError('Value of "%s" might be in this list: %s' % (name,
', '.join([s for s in (field.choices.iterkeys() if isinstance(field.choices, dict) ', '.join([s for s in (field.choices.iterkeys() if isinstance(field.choices, dict)
else field.choices)])) else field.choices)])))
self.config[name] = value self.config[name] = value
self.storage = BackendStorage(self.name, storage) self.storage = BackendStorage(self.name, storage)
self.storage.load(self.STORAGE) self.storage.load(self.STORAGE)