diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-02-12 10:59:36 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-02-12 10:59:36 -0300 |
| commit | 75e564c7a98243d3b2ba6bea2478abe69a875855 (patch) | |
| tree | ed7615e3819ac1f859cff78d88d8d68993a86f87 /src/leap/bitmask/crypto | |
| parent | 73047830a243217406d72b267d106c5c8434b499 (diff) | |
| parent | 29902330067f564185d7b57a864be2099f8ea2e8 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/cancel-login-does-not-work' into develop
Diffstat (limited to 'src/leap/bitmask/crypto')
| -rw-r--r-- | src/leap/bitmask/crypto/srpauth.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py index bdd38db2..1fb7b774 100644 --- a/src/leap/bitmask/crypto/srpauth.py +++ b/src/leap/bitmask/crypto/srpauth.py @@ -655,7 +655,6 @@ class SRPAuth(QtCore.QObject): username = username.lower() d = self.__instance.authenticate(username, password) d.addCallback(self._gui_notify) - d.addErrback(self._errback) return d def change_password(self, current_password, new_password): @@ -695,18 +694,6 @@ class SRPAuth(QtCore.QObject): logger.debug("Successful login!") self.authentication_finished.emit(True, self.tr("Succeeded")) - def _errback(self, failure): - """ - General errback for the whole login process. Will notify the - UI with the proper signal. - - :param failure: Failure object captured from a callback. - :type failure: twisted.python.failure.Failure - """ - logger.error("Error logging in %s" % (failure,)) - self.authentication_finished.emit(False, "%s" % (failure.value,)) - failure.trap(Exception) - def get_session_id(self): return self.__instance.get_session_id() |