# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1379770450 -7200
# Node ID 17bd09cd10011c5f5a29f9af6e8939746e2c8ac8
# Parent  53de6954e94e52ae544786d98f74f28d26084260
core: misc bug fixes

diff -r 53de6954e94e -r 17bd09cd1001 src/memory/memory.py
--- a/src/memory/memory.py	Sun Sep 08 14:59:14 2013 +0200
+++ b/src/memory/memory.py	Sat Sep 21 15:34:10 2013 +0200
@@ -25,6 +25,7 @@
 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 @@
         """
         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 -r 53de6954e94e -r 17bd09cd1001 src/tools/xml_tools.py
--- a/src/tools/xml_tools.py	Sun Sep 08 14:59:14 2013 +0200
+++ b/src/tools/xml_tools.py	Sat Sep 21 15:34:10 2013 +0200
@@ -21,7 +21,7 @@
 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) """