diff options
| author | Robin Gloster <robin@loc-com.de> | 2014-08-18 15:15:14 +0200 |
|---|---|---|
| committer | Robin Gloster <robin@loc-com.de> | 2014-08-18 15:15:14 +0200 |
| commit | 3dd379cdf12d885e26f8ec26c54879a95d5f0b84 (patch) | |
| tree | 5dc018384ad03253608ff79c9fdbb577b84d2d2f /sleekxmpp/features/feature_mechanisms/mechanisms.py | |
| parent | 7265682a4d57d88956cb54f98f7a470465bbf417 (diff) | |
| download | slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.tar.gz slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.tar.bz2 slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.tar.xz slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.zip | |
Revert "cleanup semicolons, whitespace and mutable default arguments"
This reverts commit 7265682a4d57d88956cb54f98f7a470465bbf417.
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms/mechanisms.py')
| -rw-r--r-- | sleekxmpp/features/feature_mechanisms/mechanisms.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py index 1d8f8798..17ad5ed0 100644 --- a/sleekxmpp/features/feature_mechanisms/mechanisms.py +++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py @@ -187,14 +187,14 @@ class FeatureMechanisms(BasePlugin): except sasl.SASLCancelled: self.attempted_mechs.add(self.mech.name) self._send_auth() + except sasl.SASLFailed: + self.attempted_mechs.add(self.mech.name) + self._send_auth() except sasl.SASLMutualAuthFailed: log.error("Mutual authentication failed! " + \ "A security breach is possible.") self.attempted_mechs.add(self.mech.name) self.xmpp.disconnect() - except sasl.SASLFailed: - self.attempted_mechs.add(self.mech.name) - self._send_auth() else: resp.send(now=True) @@ -207,13 +207,13 @@ class FeatureMechanisms(BasePlugin): resp['value'] = self.mech.process(stanza['value']) except sasl.SASLCancelled: self.stanza.Abort(self.xmpp).send() + except sasl.SASLFailed: + self.stanza.Abort(self.xmpp).send() except sasl.SASLMutualAuthFailed: log.error("Mutual authentication failed! " + \ "A security breach is possible.") self.attempted_mechs.add(self.mech.name) self.xmpp.disconnect() - except sasl.SASLFailed: - self.stanza.Abort(self.xmpp).send() else: if resp.get_value() == '': resp.del_value() |