diff --git a/src/memory/memory.py b/src/memory/memory.py index 6de46173..bcc9f4ad 100644 --- a/src/memory/memory.py +++ b/src/memory/memory.py @@ -25,6 +25,7 @@ from xml.dom import minidom from logging import debug, info, warning, error from twisted.internet import defer from twisted.words.protocols.jabber import jid +from twisted.python.failure import Failure from sat.tools.xml_tools import paramsXml2xmlUI from sat.core.default_config import default_config from sat.memory.sqlite import SqliteStorage @@ -161,9 +162,9 @@ class Params(object): """ if self.storage.hasProfile(profile): info(_('The profile name already exists')) - return defer.fail("CONFLICT") + return defer.fail(Failure(u"CONFLICT")) if not self.host.trigger.point("ProfileCreation", profile): - return defer.fail("CANCEL") + return defer.fail(Failure(u"CANCEL")) return self.storage.createProfile(profile) def deleteProfile(self, profile): diff --git a/src/tools/xml_tools.py b/src/tools/xml_tools.py index 741fc494..dbf09242 100644 --- a/src/tools/xml_tools.py +++ b/src/tools/xml_tools.py @@ -21,7 +21,7 @@ from logging import debug, info, error from xml.dom import minidom from wokkel import data_form from twisted.words.xish import domish -from core import exceptions +from sat.core import exceptions """This library help manage XML used in SàT (parameters, registration, etc) """