Manual cleanup of the remaining set([…]) and set((…)).

slixmpp/clientxmpp.py

@@ -108,15 +108,10 @@ class ClientXMPP(BaseXMPP):
                 CoroutineCallback('Stream Features',
                      MatchXPath('{%s}features' % self.stream_ns),
                      self._handle_stream_features))
-        def roster_push_filter(iq):
-            from_ = iq['from']
-            if from_ and from_ != self.boundjid.bare:
-                return
-            self.event('roster_update', iq)
         self.register_handler(
                 Callback('Roster Update',
                          StanzaPath('iq@type=set/roster'),
-                         roster_push_filter))
+                         lambda iq: self.event('roster_update', iq)))
 
         # Setup default stream features
         self.register_plugin('feature_starttls')

slixmpp/plugins/xep_0009/rpc.py

@@ -121,7 +121,7 @@ class XEP_0009(BasePlugin):
     def _recipient_unvailable(self, iq):
         payload = iq.get_payload()
         iq = iq.reply()
-        iq.error().set_payload(payload)
+        error().set_payload(payload)
         iq['error']['code'] = '404'
         iq['error']['type'] = 'wait'
         iq['error']['condition'] = 'recipient-unavailable'

slixmpp/plugins/xep_0079/stanza.py

@@ -8,7 +8,6 @@
 
 from __future__ import unicode_literals
 
-from slixmpp import JID
 from slixmpp.xmlstream import ElementBase, register_stanza_plugin
 
 

slixmpp/plugins/xep_0221/stanza.py

@@ -36,7 +36,7 @@ class URI(ElementBase):
         self.xml.text = value
 
     def del_value(self):
-        self.xml.text = ''
+        sel.xml.text = ''
 
 
 register_stanza_plugin(Media, URI, iterable=True)

slixmpp/plugins/xep_0222.py

@@ -28,7 +28,7 @@ class XEP_0222(BasePlugin):
     profile = {'pubsub#persist_items': True,
                'pubsub#send_last_published_item': 'never'}
 
-    def configure(self, node, ifrom=None, callback=None, timeout=None):
+    def configure(self, node):
         """
         Update a node's configuration to match the public storage profile.
         """

slixmpp/plugins/xep_0223.py

@@ -28,7 +28,7 @@ class XEP_0223(BasePlugin):
     profile = {'pubsub#persist_items': True,
                'pubsub#send_last_published_item': 'never'}
 
-    def configure(self, node, ifrom=None, callback=None, timeout=None):
+    def configure(self, node):
         """
         Update a node's configuration to match the public storage profile.
         """

slixmpp/plugins/xep_0258/stanza.py

@@ -8,7 +8,6 @@
 
 from base64 import b64encode, b64decode
 
-from slixmpp import JID
 from slixmpp.util import bytes
 from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
 

slixmpp/plugins/xep_0313/stanza.py

@@ -135,5 +135,5 @@ class Archived(ElementBase):
     def get_by(self):
         return JID(self._get_attr('by'))
 
-    def set_by(self, value):
+    def set_by(self):
         return self._set_attr('by', str(value))

slixmpp/plugins/xep_0323/stanza/sensordata.py

@@ -10,7 +10,7 @@
 
 from slixmpp import Iq, Message
 from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
-import re
+from re import match
 
 class Sensordata(ElementBase):
     """ Placeholder for the namespace, not used as a stanza """

slixmpp/plugins/xep_0333/hints.py

@@ -11,8 +11,6 @@ import logging
 from slixmpp import Message
 from slixmpp.plugins import BasePlugin
 from slixmpp.xmlstream import register_stanza_plugin
-from slixmpp.xmlstream.handler import Callback
-from slixmpp.xmlstream.matcher import StanzaPath
 from slixmpp.plugins.xep_0333 import stanza, Markable, Received, Displayed, Acknowledged
 
 log = logging.getLogger(__name__)

slixmpp/stanza/message.py

@@ -48,7 +48,7 @@ class Message(RootStanza):
     namespace = 'jabber:client'
     plugin_attrib = name
     interfaces = {'type', 'to', 'from', 'id', 'body', 'subject', 'thread',
-                  'parent_thread', 'mucroom', 'mucnick'}
+                  'parent_thread', 'mucroom', 'mucnick'])
     sub_interfaces = {'body', 'subject', 'thread'}
     lang_interfaces = sub_interfaces
     types = {'normal', 'chat', 'headline', 'error', 'groupchat'}

slixmpp/util/sasl/client.py

@@ -75,7 +75,7 @@ def sasl_mech(score):
             MECH_SEC_SCORES[mech.name] = mech.score
             if mech.channel_binding:
                 MECHANISMS[mech.name + '-PLUS'] = mech
-                MECH_SEC_SCORES[mech.name] = mech.score + 10
+                MECH_SEC_SCORES[name] = mech.score + 10
         return mech
     return register
 

slixmpp/util/stringprep_profiles.py

@@ -146,7 +146,6 @@ def create(nfkc=True, bidi=True, mappings=None,
         if bidi:
             check_bidi(data)
         if query and unassigned:
-            #check_unassigned(data, unassigned)
-            raise StringPrepError('Query profile with unassigned data is unimplemented.')
+            check_unassigned(data, unassigned)
         return data
     return profile

slixmpp/version.py

@@ -9,5 +9,5 @@
 # We don't want to have to import the entire library
 # just to get the version info for setup.py
 
-__version__ = '1.2.2'
-__version_info__ = (1, 2, 2)
+__version__ = '1.2.1'
+__version_info__ = (1, 2, 1)

slixmpp/xmlstream/cert.py

@@ -76,7 +76,7 @@ def extract_names(raw_cert):
             name_type = name.getName()
             if name_type == 'dNSName':
                 results['DNS'].add(decode_str(name.getComponent()))
-            elif name_type == 'uniformResourceIdentifier':
+            if name_type == 'uniformResourceIdentifier':
                 value = decode_str(name.getComponent())
                 if value.startswith('xmpp:'):
                     results['URI'].add(value[5:])