--- a/sat/stdui/ui_profile_manager.py	Wed Jun 27 07:51:29 2018 +0200
+++ b/sat/stdui/ui_profile_manager.py	Wed Jun 27 20:14:46 2018 +0200
@@ -21,6 +21,7 @@
 from sat.core.i18n import D_
 from sat.core.constants import Const as C
 from sat.core.log import getLogger
+
 log = getLogger(__name__)
 from sat.core import exceptions
 from sat.tools import xml_tools
@@ -35,9 +36,15 @@
         self.host = host
         self.profile_ciphers = {}
         self._sessions = ProfileSessions()
-        host.registerCallback(self._authenticateProfile, force_id=C.AUTHENTICATE_PROFILE_ID, with_data=True)
-        host.registerCallback(self._changeXMPPPassword, force_id=C.CHANGE_XMPP_PASSWD_ID, with_data=True)
-        self.__new_xmpp_passwd_id = host.registerCallback(self._changeXMPPPasswordCb, with_data=True)
+        host.registerCallback(
+            self._authenticateProfile, force_id=C.AUTHENTICATE_PROFILE_ID, with_data=True
+        )
+        host.registerCallback(
+            self._changeXMPPPassword, force_id=C.CHANGE_XMPP_PASSWD_ID, with_data=True
+        )
+        self.__new_xmpp_passwd_id = host.registerCallback(
+            self._changeXMPPPasswordCb, with_data=True
+        )
 
     def _startSessionEb(self, fail, first, profile):
         """Errback method for startSession during profile authentication
@@ -49,66 +56,93 @@
         """
         if first:
             # first call, we ask for the password
-            form_ui = xml_tools.XMLUI("form", title=D_('Profile password for {}').format(profile), submit_id='')
-            form_ui.addPassword('profile_password', value='')
+            form_ui = xml_tools.XMLUI(
+                "form", title=D_("Profile password for {}").format(profile), submit_id=""
+            )
+            form_ui.addPassword("profile_password", value="")
             d = xml_tools.deferredUI(self.host, form_ui, chained=True)
             d.addCallback(self._authenticateProfile, profile)
-            return {'xmlui': form_ui.toXml()}
+            return {"xmlui": form_ui.toXml()}
 
         assert profile is None
 
         if fail.check(exceptions.PasswordError):
-            dialog = xml_tools.XMLUI('popup', title=D_('Connection error'))
+            dialog = xml_tools.XMLUI("popup", title=D_("Connection error"))
             dialog.addText(D_("The provided profile password doesn't match."))
         else:
             log.error(u"Unexpected exceptions: {}".format(fail))
-            dialog = xml_tools.XMLUI('popup', title=D_('Internal error'))
+            dialog = xml_tools.XMLUI("popup", title=D_("Internal error"))
             dialog.addText(D_(u"Internal error: {}".format(fail)))
-        return {'xmlui': dialog.toXml(), 'validated': C.BOOL_FALSE}
+        return {"xmlui": dialog.toXml(), "validated": C.BOOL_FALSE}
 
     def _authenticateProfile(self, data, profile):
-        if C.bool(data.get('cancelled', 'false')):
+        if C.bool(data.get("cancelled", "false")):
             return {}
         if self.host.memory.isSessionStarted(profile):
-            return {'validated': C.BOOL_TRUE}
+            return {"validated": C.BOOL_TRUE}
         try:
-            password = data[xml_tools.formEscape('profile_password')]
+            password = data[xml_tools.formEscape("profile_password")]
         except KeyError:
             # first request, we try empty password
-            password = ''
+            password = ""
             first = True
             eb_profile = profile
         else:
             first = False
             eb_profile = None
         d = self.host.memory.startSession(password, profile)
-        d.addCallback(lambda dummy: {'validated': C.BOOL_TRUE})
+        d.addCallback(lambda dummy: {"validated": C.BOOL_TRUE})
         d.addErrback(self._startSessionEb, first, eb_profile)
         return d
 
     def _changeXMPPPassword(self, data, profile):
         session_data = self._sessions.profileGetUnique(profile)
         if not session_data:
-            server = self.host.memory.getParamA(C.FORCE_SERVER_PARAM, "Connection", profile_key=profile)
+            server = self.host.memory.getParamA(
+                C.FORCE_SERVER_PARAM, "Connection", profile_key=profile
+            )
             if not server:
-                server = jid.parse(self.host.memory.getParamA('JabberID', "Connection", profile_key=profile))[1]
-            session_id, session_data = self._sessions.newSession({'count': 0, 'server': server}, profile=profile)
-        if session_data['count'] > 2:  # 3 attempts with a new password after the initial try
+                server = jid.parse(
+                    self.host.memory.getParamA(
+                        "JabberID", "Connection", profile_key=profile
+                    )
+                )[1]
+            session_id, session_data = self._sessions.newSession(
+                {"count": 0, "server": server}, profile=profile
+            )
+        if (
+            session_data["count"] > 2
+        ):  # 3 attempts with a new password after the initial try
             self._sessions.profileDelUnique(profile)
-            _dialog = xml_tools.XMLUI('popup', title=D_('Connection error'))
-            _dialog.addText(D_("Can't connect to %s. Please check your connection details.") % session_data['server'])
-            return {'xmlui': _dialog.toXml()}
-        session_data['count'] += 1
-        counter = ' (%d)' % session_data['count'] if session_data['count'] > 1 else ''
-        title = D_('XMPP password for %(profile)s%(counter)s') % {'profile': profile, 'counter': counter}
-        form_ui = xml_tools.XMLUI("form", title=title, submit_id=self.__new_xmpp_passwd_id)
-        form_ui.addText(D_("Can't connect to %s. Please check your connection details or try with another password.") % session_data['server'])
-        form_ui.addPassword('xmpp_password', value='')
-        return {'xmlui': form_ui.toXml()}
+            _dialog = xml_tools.XMLUI("popup", title=D_("Connection error"))
+            _dialog.addText(
+                D_("Can't connect to %s. Please check your connection details.")
+                % session_data["server"]
+            )
+            return {"xmlui": _dialog.toXml()}
+        session_data["count"] += 1
+        counter = " (%d)" % session_data["count"] if session_data["count"] > 1 else ""
+        title = D_("XMPP password for %(profile)s%(counter)s") % {
+            "profile": profile,
+            "counter": counter,
+        }
+        form_ui = xml_tools.XMLUI(
+            "form", title=title, submit_id=self.__new_xmpp_passwd_id
+        )
+        form_ui.addText(
+            D_(
+                "Can't connect to %s. Please check your connection details or try with another password."
+            )
+            % session_data["server"]
+        )
+        form_ui.addPassword("xmpp_password", value="")
+        return {"xmlui": form_ui.toXml()}
 
     def _changeXMPPPasswordCb(self, data, profile):
-        xmpp_password = data[xml_tools.formEscape('xmpp_password')]
-        d = self.host.memory.setParam("Password", xmpp_password, "Connection", profile_key=profile)
+        xmpp_password = data[xml_tools.formEscape("xmpp_password")]
+        d = self.host.memory.setParam(
+            "Password", xmpp_password, "Connection", profile_key=profile
+        )
         d.addCallback(lambda dummy: self.host.connect(profile))
         d.addCallback(lambda dummy: {})
         d.addErrback(lambda dummy: self._changeXMPPPassword({}, profile))