SettingParseException was moved to utils.settings
This commit is contained in:
parent
7d57ac2fa9
commit
e36c007a24
2 changed files with 3 additions and 3 deletions
|
@ -119,7 +119,7 @@ class Module(ModuleManager.BaseModule):
|
||||||
setting_object = export_settings[setting]
|
setting_object = export_settings[setting]
|
||||||
try:
|
try:
|
||||||
validated_value = setting_object.parse(value)
|
validated_value = setting_object.parse(value)
|
||||||
except utils.SettingParseException as e:
|
except utils.settings.SettingParseException as e:
|
||||||
raise ConfigInvalidValue(str(e))
|
raise ConfigInvalidValue(str(e))
|
||||||
|
|
||||||
if not validated_value == None:
|
if not validated_value == None:
|
||||||
|
|
|
@ -21,8 +21,8 @@ def _parse(value):
|
||||||
if mechanism in ALL_MECHANISMS:
|
if mechanism in ALL_MECHANISMS:
|
||||||
return {"mechanism": mechanism.upper(), "args": arguments}
|
return {"mechanism": mechanism.upper(), "args": arguments}
|
||||||
else:
|
else:
|
||||||
raise utils.SettingParseException("Unknown SASL mechanism '%s'"
|
raise utils.settings.SettingParseException(
|
||||||
% mechanism)
|
"Unknown SASL mechanism '%s'" % mechanism)
|
||||||
|
|
||||||
SASL_TIMEOUT = 15 # 15 seconds
|
SASL_TIMEOUT = 15 # 15 seconds
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue