summaryrefslogtreecommitdiff
path: root/slixmpp/features
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-10-22 13:35:54 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-10-22 13:37:46 +0100
commitd008988843f61efb57cb06a30b8a47a357e248a4 (patch)
treee1bd486fd53639561f5af179451f846e371b570c /slixmpp/features
parentdcacc7d7d50d3f720cb14f1382c6d4f5a13664a4 (diff)
downloadslixmpp-d008988843f61efb57cb06a30b8a47a357e248a4.tar.gz
slixmpp-d008988843f61efb57cb06a30b8a47a357e248a4.tar.bz2
slixmpp-d008988843f61efb57cb06a30b8a47a357e248a4.tar.xz
slixmpp-d008988843f61efb57cb06a30b8a47a357e248a4.zip
Manual cleanup of the remaining set([…]) and set((…)).
Diffstat (limited to 'slixmpp/features')
-rw-r--r--slixmpp/features/feature_mechanisms/mechanisms.py2
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/failure.py9
2 files changed, 6 insertions, 5 deletions
diff --git a/slixmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py
index 8e507afc..33bdaff5 100644
--- a/slixmpp/features/feature_mechanisms/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/mechanisms.py
@@ -49,7 +49,7 @@ class FeatureMechanisms(BasePlugin):
if self.security_callback is None:
self.security_callback = self._default_security
- creds = self.sasl_callback(set(['username']), set())
+ creds = self.sasl_callback({'username'}, set())
if not self.use_mech and not creds['username']:
self.use_mech = 'ANONYMOUS'
diff --git a/slixmpp/features/feature_mechanisms/stanza/failure.py b/slixmpp/features/feature_mechanisms/stanza/failure.py
index b4428fcc..adc686b7 100644
--- a/slixmpp/features/feature_mechanisms/stanza/failure.py
+++ b/slixmpp/features/feature_mechanisms/stanza/failure.py
@@ -19,10 +19,11 @@ class Failure(StanzaBase):
interfaces = {'condition', 'text'}
plugin_attrib = name
sub_interfaces = {'text'}
- conditions = set(('aborted', 'account-disabled', 'credentials-expired',
- 'encryption-required', 'incorrect-encoding', 'invalid-authzid',
- 'invalid-mechanism', 'malformed-request', 'mechansism-too-weak',
- 'not-authorized', 'temporary-auth-failure'))
+ conditions = {'aborted', 'account-disabled', 'credentials-expired',
+ 'encryption-required', 'incorrect-encoding',
+ 'invalid-authzid', 'invalid-mechanism', 'malformed-request',
+ 'mechansism-too-weak', 'not-authorized',
+ 'temporary-auth-failure'}
def setup(self, xml=None):
"""