slixmpp 1.2.4 release

Fix CVE-2015-8688, and a few bugfixes.

.gitlab-ci.yml

@@ -0,0 +1,8 @@
+test:
+  tags:
+    - docker
+  image: ubuntu:latest
+  script:
+    - apt update
+    - apt install -y python3 cython3
+    - ./run_tests.py

README.rst

@@ -12,8 +12,8 @@ Building
 --------
 
 Slixmpp can make use of cython to improve performance on critical modules.
-To do that, cython3 is necessary along with libidn headers. Otherwise,
-no compilation is needed. Building is done by running setup.py::
+To do that, **cython3** is necessary along with **libidn** headers.
+Otherwise, no compilation is needed. Building is done by running setup.py::
 
     python3 setup.py build_ext --inplace
 
@@ -108,6 +108,11 @@ Slixmpp Credits
 
 **Contributors:**
     - Emmanuel Gil Peyrot (`Link mauve <xmpp:linkmauve@linkmauve.fr?message>`_)
+    - Sam Whited (`Sam Whited <mailto:sam@samwhited.com>`_)
+    - Dan Sully (`Dan Sully <mailto:daniel@electricalrain.com>`_)
+    - Gasper Zejn (`Gasper Zejn <mailto:zejn@kiberpipa.org>`_)
+    - Krzysztof Kotlenga (`Krzysztof Kotlenga <mailto:pocek@users.sf.net>`_)
+    - Tsukasa Hiiragi (`Tsukasa Hiiragi <mailto:bakalolka@gmail.com>`_)
 
 Credits (SleekXMPP)
 -------------------

docs/create_plugin.rst

@@ -163,7 +163,7 @@ behaviour:
         namespace = 'jabber:iq:register'
         name = 'query'
         plugin_attrib = 'register'
-        interfaces = set(('username', 'password', 'registered', 'remove'))
+        interfaces = {'username', 'password', 'registered', 'remove'}
         sub_interfaces = interfaces
 
         def getRegistered(self):
@@ -535,10 +535,10 @@ with some additional registration fields implemented.
         namespace = 'jabber:iq:register'
         name = 'query'
         plugin_attrib = 'register'
-        interfaces = set(('username', 'password', 'email', 'nick', 'name',
-                          'first', 'last', 'address', 'city', 'state', 'zip',
-                          'phone', 'url', 'date', 'misc', 'text', 'key',
-                          'registered', 'remove', 'instructions'))
+        interfaces = {'username', 'password', 'email', 'nick', 'name',
+                      'first', 'last', 'address', 'city', 'state', 'zip',
+                      'phone', 'url', 'date', 'misc', 'text', 'key',
+                      'registered', 'remove', 'instructions'}
         sub_interfaces = interfaces
 
         def getRegistered(self):

docs/getting_started/echobot.rst

@@ -70,7 +70,7 @@ as well.
     class EchoBot(slixmpp.ClientXMPP):
 
         def __init__(self, jid, password):
-            super(EchoBot, self).__init__(jid, password)
+            super().__init__(jid, password)
 
 Handling Session Start
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -83,7 +83,7 @@ started. To do that, we will register an event handler for the :term:`session_st
 .. code-block:: python
 
      def __init__(self, jid, password):
-        super(EchoBot, self).__init__(jid, password)
+        super().__init__(jid, password)
 
         self.add_event_handler('session_start', self.start)
 
@@ -153,7 +153,7 @@ whenever a messsage is received.
 .. code-block:: python
 
      def __init__(self, jid, password):
-        super(EchoBot, self).__init__(jid, password)
+        super().__init__(jid, password)
 
         self.add_event_handler('session_start', self.start)
         self.add_event_handler('message', self.message)

docs/getting_started/muc.rst

@@ -1,7 +1,7 @@
 .. _mucbot:
 
 =========================
-Mulit-User Chat (MUC) Bot
+Multi-User Chat (MUC) Bot
 =========================
 
 .. note::
@@ -63,13 +63,13 @@ has been established:
     def start(self, event):
         self.get_roster()
         self.send_presence()
-        self.plugin['xep_0045'].joinMUC(self.room,
-                                        self.nick,
-                                        wait=True)
+        self.plugin['xep_0045'].join_muc(self.room,
+                                         self.nick,
+                                         wait=True)
 
 Note that as in :ref:`echobot`, we need to include send an initial presence and request
 the roster. Next, we want to join the group chat, so we call the
-``joinMUC`` method of the MUC plugin.
+``join_muc`` method of the MUC plugin.
 
 .. note::
 

docs/getting_started/sendlogout.rst

@@ -24,7 +24,7 @@ for the JID that will receive our message, and the string content of the message
     class SendMsgBot(slixmpp.ClientXMPP):
 
         def __init__(self, jid, password, recipient, msg):
-            super(SendMsgBot, self).__init__(jid, password)
+            super().__init__(jid, password)
 
             self.recipient = recipient
             self.msg = msg

examples/custom_stanzas/stanza.py

@@ -41,7 +41,7 @@ class Action(ElementBase):
     #:     del action['status']
     #:
     #: to set, get, or remove its values.
-    interfaces = set(('method', 'param', 'status'))
+    interfaces = {'method', 'param', 'status'}
 
     #: By default, values in the `interfaces` set are mapped to
     #: attribute values. This can be changed such that an interface

examples/http_over_xmpp.py

@@ -13,7 +13,7 @@
 
 from slixmpp import ClientXMPP
 
-from optparse import OptionParser
+from argparse import ArgumentParser
 import logging
 import getpass
 
@@ -58,40 +58,40 @@ if __name__ == '__main__':
     # ./http_over_xmpp.py -J <jid> -P <pwd> -i <ip> -p <port> [-v]
     #
 
-    parser = OptionParser()
+    parser = ArgumentParser()
 
     # Output verbosity options.
-    parser.add_option(
+    parser.add_argument(
         '-v', '--verbose', help='set logging to DEBUG', action='store_const',
         dest='loglevel', const=logging.DEBUG, default=logging.ERROR
     )
 
     # JID and password options.
-    parser.add_option('-J', '--jid', dest='jid', help='JID')
-    parser.add_option('-P', '--password', dest='password', help='Password')
+    parser.add_argument('-J', '--jid', dest='jid', help='JID')
+    parser.add_argument('-P', '--password', dest='password', help='Password')
 
     # XMPP server ip and port options.
-    parser.add_option(
+    parser.add_argument(
         '-i', '--ipaddr', dest='ipaddr',
         help='IP Address of the XMPP server', default=None
     )
-    parser.add_option(
+    parser.add_argument(
         '-p', '--port', dest='port',
         help='Port of the XMPP server', default=None
     )
 
-    opts, args = parser.parse_args()
+    args = parser.parse_args()
 
     # Setup logging.
-    logging.basicConfig(level=opts.loglevel,
+    logging.basicConfig(level=args.loglevel,
                         format='%(levelname)-8s %(message)s')
 
-    if opts.jid is None:
-        opts.jid = input('Username: ')
-    if opts.password is None:
-        opts.password = getpass.getpass('Password: ')
+    if args.jid is None:
+        args.jid = input('Username: ')
+    if args.password is None:
+        args.password = getpass.getpass('Password: ')
 
-    xmpp = HTTPOverXMPPClient(opts.jid, opts.password)
+    xmpp = HTTPOverXMPPClient(args.jid, args.password)
     xmpp.connect()
     xmpp.process()
 

examples/muc.py

@@ -67,11 +67,11 @@ class MUCBot(slixmpp.ClientXMPP):
         """
         self.get_roster()
         self.send_presence()
-        self.plugin['xep_0045'].joinMUC(self.room,
-                                        self.nick,
-                                        # If a room password is needed, use:
-                                        # password=the_room_password,
-                                        wait=True)
+        self.plugin['xep_0045'].join_muc(self.room,
+                                         self.nick,
+                                         # If a room password is needed, use:
+                                         # password=the_room_password,
+                                         wait=True)
 
     def muc_message(self, msg):
         """

examples/pubsub_client.py

@@ -15,7 +15,7 @@ class PubsubClient(slixmpp.ClientXMPP):
 
     def __init__(self, jid, password, server,
                        node=None, action='nodes', data=''):
-        super(PubsubClient, self).__init__(jid, password)
+        super().__init__(jid, password)
 
         self.register_plugin('xep_0030')
         self.register_plugin('xep_0059')

examples/pubsub_events.py

@@ -14,7 +14,7 @@ from slixmpp.xmlstream.handler import Callback
 class PubsubEvents(slixmpp.ClientXMPP):
 
     def __init__(self, jid, password):
-        super(PubsubEvents, self).__init__(jid, password)
+        super().__init__(jid, password)
 
         self.register_plugin('xep_0030')
         self.register_plugin('xep_0059')

examples/user_location.py

@@ -22,7 +22,7 @@ from slixmpp import ClientXMPP
 class LocationBot(ClientXMPP):
 
     def __init__(self, jid, password):
-        super(LocationBot, self).__init__(jid, password)
+        super().__init__(jid, password)
 
         self.add_event_handler('session_start', self.start)
         self.add_event_handler('user_location_publish',

examples/user_tune.py

@@ -17,7 +17,7 @@ from slixmpp import ClientXMPP
 class TuneBot(ClientXMPP):
 
     def __init__(self, jid, password):
-        super(TuneBot, self).__init__(jid, password)
+        super().__init__(jid, password)
 
         # Check for the current song every 5 seconds.
         self.schedule('Check Current Tune', 5, self._update_tune, repeat=True)

setup.py

@@ -7,20 +7,15 @@
 # This software is licensed as described in the README.rst and LICENSE
 # file, which you should have received as part of this distribution.
 
+import os
 from pathlib import Path
+from subprocess import call, DEVNULL, check_output, CalledProcessError
+from tempfile import TemporaryFile
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
-try:
-    from Cython.Build import cythonize
-except ImportError:
-    print('Cython not found, falling back to the slow stringprep module.')
-    ext_modules = None
-else:
-    ext_modules = cythonize('slixmpp/stringprep.pyx')
-
 from run_tests import TestCommand
 from slixmpp.version import __version__
 
@@ -40,6 +35,40 @@ CLASSIFIERS = [
 
 packages = [str(mod.parent) for mod in Path('slixmpp').rglob('__init__.py')]
 
+def check_include(library_name, header):
+    command = [os.environ.get('PKG_CONFIG', 'pkg-config'), '--cflags', library_name]
+    try:
+        cflags = check_output(command).decode('utf-8').split()
+    except FileNotFoundError:
+        print('pkg-config not found.')
+        return False
+    except CalledProcessError:
+        # pkg-config already prints the missing libraries on stderr.
+        return False
+    command = [os.environ.get('CC', 'cc')] + cflags + ['-E', '-']
+    with TemporaryFile('w+') as c_file:
+        c_file.write('#include <%s>' % header)
+        c_file.seek(0)
+        try:
+            return call(command, stdin=c_file, stdout=DEVNULL, stderr=DEVNULL) == 0
+        except FileNotFoundError:
+            print('%s headers not found.' % library_name)
+            return False
+
+HAS_PYTHON_HEADERS = check_include('python3', 'Python.h')
+HAS_STRINGPREP_HEADERS = check_include('libidn', 'stringprep.h')
+
+ext_modules = None
+if HAS_PYTHON_HEADERS and HAS_STRINGPREP_HEADERS:
+    try:
+        from Cython.Build import cythonize
+    except ImportError:
+        print('Cython not found, falling back to the slow stringprep module.')
+    else:
+        ext_modules = cythonize('slixmpp/stringprep.pyx')
+else:
+    print('Falling back to the slow stringprep module.')
+
 setup(
     name="slixmpp",
     version=VERSION,

slixmpp/clientxmpp.py

@@ -15,6 +15,7 @@
 import asyncio
 import logging
 
+from slixmpp.jid import JID
 from slixmpp.stanza import StreamFeatures
 from slixmpp.basexmpp import BaseXMPP
 from slixmpp.exceptions import XMPPError
@@ -108,10 +109,21 @@ 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_ != JID('') and from_ != self.boundjid.bare:
+                reply = iq.reply()
+                reply['type'] = 'error'
+                reply['error']['type'] = 'cancel'
+                reply['error']['code'] = 503
+                reply['error']['condition'] = 'service-unavailable'
+                reply.send()
+                return
+            self.event('roster_update', iq)
         self.register_handler(
                 Callback('Roster Update',
                          StanzaPath('iq@type=set/roster'),
-                         lambda iq: self.event('roster_update', iq)))
+                         roster_push_filter))
 
         # Setup default stream features
         self.register_plugin('feature_starttls')
@@ -141,8 +153,11 @@ class ClientXMPP(BaseXMPP):
         will be used.
 
         :param address: A tuple containing the server's host and port.
-        :param use_tls: Indicates if TLS should be used for the
-                        connection. Defaults to ``True``.
+        :param force_starttls: Indicates that negotiation should be aborted
+                               if the server does not advertise support for
+                               STARTTLS. Defaults to ``True``.
+        :param disable_starttls: Disables TLS for the connection.
+                                 Defaults to ``False``.
         :param use_ssl: Indicates if the older SSL connection method
                         should be used. Defaults to ``False``.
         """

slixmpp/exceptions.py

@@ -77,7 +77,7 @@ class IqTimeout(XMPPError):
     """
 
     def __init__(self, iq):
-        super(IqTimeout, self).__init__(
+        super().__init__(
                 condition='remote-server-timeout',
                 etype='cancel')
 
@@ -94,7 +94,7 @@ class IqError(XMPPError):
     """
 
     def __init__(self, iq):
-        super(IqError, self).__init__(
+        super().__init__(
                 condition=iq['error']['condition'],
                 text=iq['error']['text'],
                 etype=iq['error']['type'])

slixmpp/features/feature_bind/stanza.py

@@ -16,6 +16,6 @@ class Bind(ElementBase):
 
     name = 'bind'
     namespace = 'urn:ietf:params:xml:ns:xmpp-bind'
-    interfaces = set(('resource', 'jid'))
+    interfaces = {'resource', 'jid'}
     sub_interfaces = interfaces
     plugin_attrib = 'bind'

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'
 

slixmpp/features/feature_mechanisms/stanza/auth.py

@@ -19,12 +19,12 @@ class Auth(StanzaBase):
 
     name = 'auth'
     namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
-    interfaces = set(('mechanism', 'value'))
+    interfaces = {'mechanism', 'value'}
     plugin_attrib = name
 
     #: Some SASL mechs require sending values as is,
     #: without converting base64.
-    plain_mechs = set(['X-MESSENGER-OAUTH2'])
+    plain_mechs = {'X-MESSENGER-OAUTH2'}
 
     def setup(self, xml):
         StanzaBase.setup(self, xml)

slixmpp/features/feature_mechanisms/stanza/challenge.py

@@ -19,7 +19,7 @@ class Challenge(StanzaBase):
 
     name = 'challenge'
     namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
-    interfaces = set(('value',))
+    interfaces = {'value'}
     plugin_attrib = name
 
     def setup(self, xml):

slixmpp/features/feature_mechanisms/stanza/failure.py

@@ -16,13 +16,14 @@ class Failure(StanzaBase):
 
     name = 'failure'
     namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
-    interfaces = set(('condition', 'text'))
+    interfaces = {'condition', 'text'}
     plugin_attrib = name
-    sub_interfaces = set(('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'))
+    sub_interfaces = {'text'}
+    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):
         """

slixmpp/features/feature_mechanisms/stanza/mechanisms.py

@@ -16,7 +16,7 @@ class Mechanisms(ElementBase):
 
     name = 'mechanisms'
     namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
-    interfaces = set(('mechanisms', 'required'))
+    interfaces = {'mechanisms', 'required'}
     plugin_attrib = name
     is_extension = True
 

slixmpp/features/feature_mechanisms/stanza/response.py

@@ -19,7 +19,7 @@ class Response(StanzaBase):
 
     name = 'response'
     namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
-    interfaces = set(('value',))
+    interfaces = {'value'}
     plugin_attrib = name
 
     def setup(self, xml):

slixmpp/features/feature_mechanisms/stanza/success.py

@@ -18,7 +18,7 @@ class Success(StanzaBase):
 
     name = 'success'
     namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
-    interfaces = set(['value'])
+    interfaces = {'value'}
     plugin_attrib = name
 
     def setup(self, xml):

slixmpp/features/feature_starttls/stanza.py

@@ -16,7 +16,7 @@ class STARTTLS(ElementBase):
 
     name = 'starttls'
     namespace = 'urn:ietf:params:xml:ns:xmpp-tls'
-    interfaces = set(('required',))
+    interfaces = {'required'}
     plugin_attrib = name
 
     def get_required(self):

slixmpp/jid.py

@@ -79,7 +79,7 @@ def _validate_node(node):
     :returns: The local portion of a JID, as validated by nodeprep.
     """
     if node is None:
-        return None
+        return ''
 
     try:
         node = nodeprep(node)
@@ -160,7 +160,7 @@ def _validate_resource(resource):
     :returns: The local portion of a JID, as validated by resourceprep.
     """
     if resource is None:
-        return None
+        return ''
 
     try:
         resource = resourceprep(resource)

slixmpp/plugins/base.py

@@ -308,7 +308,7 @@ class BasePlugin(object):
         if key in self.default_config:
             self.config[key] = value
         else:
-            super(BasePlugin, self).__setattr__(key, value)
+            super().__setattr__(key, value)
 
     def _init(self):
         """Initialize plugin state, such as registering event handlers.

slixmpp/plugins/gmail_notify.py

@@ -21,15 +21,15 @@ class GmailQuery(ElementBase):
     namespace = 'google:mail:notify'
     name = 'query'
     plugin_attrib = 'gmail'
-    interfaces = set(('newer-than-time', 'newer-than-tid', 'q', 'search'))
+    interfaces = {'newer-than-time', 'newer-than-tid', 'q', 'search'}
 
-    def getSearch(self):
+    def get_search(self):
         return self['q']
 
-    def setSearch(self, search):
+    def set_search(self, search):
         self['q'] = search
 
-    def delSearch(self):
+    def del_search(self):
         del self['q']
 
 
@@ -37,20 +37,20 @@ class MailBox(ElementBase):
     namespace = 'google:mail:notify'
     name = 'mailbox'
     plugin_attrib = 'mailbox'
-    interfaces = set(('result-time', 'total-matched', 'total-estimate',
-                      'url', 'threads', 'matched', 'estimate'))
+    interfaces = {'result-time', 'total-matched', 'total-estimate',
+                  'url', 'threads', 'matched', 'estimate'}
 
-    def getThreads(self):
+    def get_threads(self):
         threads = []
         for threadXML in self.xml.findall('{%s}%s' % (MailThread.namespace,
                                                       MailThread.name)):
             threads.append(MailThread(xml=threadXML, parent=None))
         return threads
 
-    def getMatched(self):
+    def get_matched(self):
         return self['total-matched']
 
-    def getEstimate(self):
+    def get_estimate(self):
         return self['total-estimate'] == '1'
 
 
@@ -58,11 +58,11 @@ class MailThread(ElementBase):
     namespace = 'google:mail:notify'
     name = 'mail-thread-info'
     plugin_attrib = 'thread'
-    interfaces = set(('tid', 'participation', 'messages', 'date',
-                      'senders', 'url', 'labels', 'subject', 'snippet'))
-    sub_interfaces = set(('labels', 'subject', 'snippet'))
+    interfaces = {'tid', 'participation', 'messages', 'date',
+                  'senders', 'url', 'labels', 'subject', 'snippet'}
+    sub_interfaces = {'labels', 'subject', 'snippet'}
 
-    def getSenders(self):
+    def get_senders(self):
         senders = []
         sendersXML = self.xml.find('{%s}senders' % self.namespace)
         if sendersXML is not None:
@@ -75,12 +75,12 @@ class MailSender(ElementBase):
     namespace = 'google:mail:notify'
     name = 'sender'
     plugin_attrib = 'sender'
-    interfaces = set(('address', 'name', 'originator', 'unread'))
+    interfaces = {'address', 'name', 'originator', 'unread'}
 
-    def getOriginator(self):
+    def get_originator(self):
         return self.xml.attrib.get('originator', '0') == '1'
 
-    def getUnread(self):
+    def get_unread(self):
         return self.xml.attrib.get('unread', '0') == '1'
 
 

slixmpp/plugins/google/__init__.py

@@ -0,0 +1,47 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin, BasePlugin
+
+from slixmpp.plugins.google.gmail import Gmail
+from slixmpp.plugins.google.auth import GoogleAuth
+from slixmpp.plugins.google.settings import GoogleSettings
+from slixmpp.plugins.google.nosave import GoogleNoSave
+
+
+class Google(BasePlugin):
+
+    """
+    Google: Custom GTalk Features
+
+    Also see: <https://developers.google.com/talk/jep_extensions/extensions>
+    """
+
+    name = 'google'
+    description = 'Google: Custom GTalk Features'
+    dependencies = set([
+        'gmail',
+        'google_settings',
+        'google_nosave',
+        'google_auth'
+    ])
+
+    def __getitem__(self, attr):
+        if attr in ('settings', 'nosave', 'auth'):
+            return self.xmpp['google_%s' % attr]
+        elif attr == 'gmail':
+            return self.xmpp['gmail']
+        else:
+            raise KeyError(attr)
+
+
+register_plugin(Gmail)
+register_plugin(GoogleAuth)
+register_plugin(GoogleSettings)
+register_plugin(GoogleNoSave)
+register_plugin(Google)

slixmpp/plugins/google/auth/__init__.py

@@ -0,0 +1,10 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.auth import stanza
+from slixmpp.plugins.google.auth.auth import GoogleAuth

slixmpp/plugins/google/auth/auth.py

@@ -0,0 +1,47 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.google.auth import stanza
+
+
+class GoogleAuth(BasePlugin):
+
+    """
+    Google: Auth Extensions (JID Domain Discovery, OAuth2)
+
+    Also see:
+        <https://developers.google.com/talk/jep_extensions/jid_domain_change>
+        <https://developers.google.com/talk/jep_extensions/oauth>
+    """
+
+    name = 'google_auth'
+    description = 'Google: Auth Extensions (JID Domain Discovery, OAuth2)'
+    dependencies = set(['feature_mechanisms'])
+    stanza = stanza
+
+    def plugin_init(self):
+        self.xmpp.namespace_map['http://www.google.com/talk/protocol/auth'] = 'ga'
+
+        register_stanza_plugin(self.xmpp['feature_mechanisms'].stanza.Auth,
+                               stanza.GoogleAuth)
+
+        self.xmpp.add_filter('out', self._auth)
+
+    def plugin_end(self):
+        self.xmpp.del_filter('out', self._auth)
+
+    def _auth(self, stanza):
+        if isinstance(stanza, self.xmpp['feature_mechanisms'].stanza.Auth):
+            stanza.stream = self.xmpp
+            stanza['google']['client_uses_full_bind_result'] = True
+            if stanza['mechanism'] == 'X-OAUTH2':
+                stanza['google']['service'] = 'oauth2'
+            print(stanza)
+        return stanza

slixmpp/plugins/google/auth/stanza.py

@@ -13,7 +13,7 @@ class GoogleAuth(ElementBase):
     name = 'auth'
     namespace = 'http://www.google.com/talk/protocol/auth'
     plugin_attrib = 'google'
-    interfaces = set(['client_uses_full_bind_result', 'service'])
+    interfaces = {'client_uses_full_bind_result', 'service'}
 
     discovery_attr= '{%s}client-uses-full-bind-result' % namespace
     service_attr= '{%s}service' % namespace

slixmpp/plugins/google/gmail/__init__.py

@@ -0,0 +1,10 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.gmail import stanza
+from slixmpp.plugins.google.gmail.notifications import Gmail

slixmpp/plugins/google/gmail/stanza.py

@@ -0,0 +1,101 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
+
+
+class GmailQuery(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'query'
+    plugin_attrib = 'gmail'
+    interfaces = set(['newer_than_time', 'newer_than_tid', 'search'])
+
+    def get_search(self):
+        return self._get_attr('q', '')
+
+    def set_search(self, search):
+        self._set_attr('q', search)
+
+    def del_search(self):
+        self._del_attr('q')
+
+    def get_newer_than_time(self):
+        return self._get_attr('newer-than-time', '')
+
+    def set_newer_than_time(self, value):
+        self._set_attr('newer-than-time', value)
+
+    def del_newer_than_time(self):
+        self._del_attr('newer-than-time')
+
+    def get_newer_than_tid(self):
+        return self._get_attr('newer-than-tid', '')
+
+    def set_newer_than_tid(self, value):
+        self._set_attr('newer-than-tid', value)
+
+    def del_newer_than_tid(self):
+        self._del_attr('newer-than-tid')
+
+
+class MailBox(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'mailbox'
+    plugin_attrib = 'gmail_messages'
+    interfaces = set(['result_time', 'url', 'matched', 'estimate'])
+
+    def get_matched(self):
+        return self._get_attr('total-matched', '')
+
+    def get_estimate(self):
+        return self._get_attr('total-estimate', '') == '1'
+
+    def get_result_time(self):
+        return self._get_attr('result-time', '')
+
+
+class MailThread(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'mail-thread-info'
+    plugin_attrib = 'thread'
+    plugin_multi_attrib = 'threads'
+    interfaces = set(['tid', 'participation', 'messages', 'date',
+                      'senders', 'url', 'labels', 'subject', 'snippet'])
+    sub_interfaces = set(['labels', 'subject', 'snippet'])
+
+    def get_senders(self):
+        result = []
+        senders = self.xml.findall('{%s}senders/{%s}sender' % (
+            self.namespace, self.namespace))
+
+        for sender in senders:
+            result.append(MailSender(xml=sender))
+
+        return result
+
+
+class MailSender(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'sender'
+    plugin_attrib = name
+    interfaces = set(['address', 'name', 'originator', 'unread'])
+
+    def get_originator(self):
+        return self.xml.attrib.get('originator', '0') == '1'
+
+    def get_unread(self):
+        return self.xml.attrib.get('unread', '0') == '1'
+
+
+class NewMail(ElementBase):
+    namespace = 'google:mail:notify'
+    name = 'new-mail'
+    plugin_attrib = 'gmail_notification'
+
+
+register_stanza_plugin(MailBox, MailThread, iterable=True)

slixmpp/plugins/google/nosave/__init__.py

@@ -0,0 +1,10 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.nosave import stanza
+from slixmpp.plugins.google.nosave.nosave import GoogleNoSave

slixmpp/plugins/google/nosave/nosave.py

@@ -0,0 +1,78 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.stanza import Iq, Message
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.google.nosave import stanza
+
+
+class GoogleNoSave(BasePlugin):
+
+    """
+    Google: Off the Record Chats
+
+    NOTE: This is NOT an encryption method.
+
+    Also see <https://developers.google.com/talk/jep_extensions/otr>.
+    """
+
+    name = 'google_nosave'
+    description = 'Google: Off the Record Chats'
+    dependencies = set(['google_settings'])
+    stanza = stanza
+
+    def plugin_init(self):
+        register_stanza_plugin(Message, stanza.NoSave)
+        register_stanza_plugin(Iq, stanza.NoSaveQuery)
+
+        self.xmpp.register_handler(
+                Callback('Google Nosave',
+                    StanzaPath('iq@type=set/google_nosave'),
+                    self._handle_nosave_change))
+
+    def plugin_end(self):
+        self.xmpp.remove_handler('Google Nosave')
+
+    def enable(self, jid=None, timeout=None, callback=None):
+        if jid is None:
+            self.xmpp['google_settings'].update({'archiving_enabled': False},
+                    timeout=timeout, callback=callback)
+        else:
+            iq = self.xmpp.Iq()
+            iq['type'] = 'set'
+            iq['google_nosave']['item']['jid'] = jid
+            iq['google_nosave']['item']['value'] = True
+            return iq.send(timeout=timeout, callback=callback)
+
+    def disable(self, jid=None, timeout=None, callback=None):
+        if jid is None:
+            self.xmpp['google_settings'].update({'archiving_enabled': True},
+                    timeout=timeout, callback=callback)
+        else:
+            iq = self.xmpp.Iq()
+            iq['type'] = 'set'
+            iq['google_nosave']['item']['jid'] = jid
+            iq['google_nosave']['item']['value'] = False
+            return iq.send(timeout=timeout, callback=callback)
+
+    def get(self, timeout=None, callback=None):
+        iq = self.xmpp.Iq()
+        iq['type'] = 'get'
+        iq.enable('google_nosave')
+        return iq.send(timeout=timeout, callback=callback)
+
+    def _handle_nosave_change(self, iq):
+        reply = self.xmpp.Iq()
+        reply['type'] = 'result'
+        reply['id'] = iq['id']
+        reply['to'] = iq['from']
+        reply.send()
+        self.xmpp.event('google_nosave_change', iq)

slixmpp/plugins/google/nosave/stanza.py

@@ -14,7 +14,7 @@ class NoSave(ElementBase):
     name = 'x'
     namespace = 'google:nosave'
     plugin_attrib = 'google_nosave'
-    interfaces = set(['value'])
+    interfaces = {'value'}
 
     def get_value(self):
         return self._get_attr('value', '') == 'enabled'
@@ -35,7 +35,7 @@ class Item(ElementBase):
     namespace = 'google:nosave'
     plugin_attrib = 'item'
     plugin_multi_attrib = 'items'
-    interfaces = set(['jid', 'source', 'value'])
+    interfaces = {'jid', 'source', 'value'}
 
     def get_value(self):
         return self._get_attr('value', '') == 'enabled'

slixmpp/plugins/google/settings/__init__.py

@@ -0,0 +1,10 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.settings import stanza
+from slixmpp.plugins.google.settings.settings import GoogleSettings

slixmpp/plugins/google/settings/stanza.py

@@ -0,0 +1,110 @@
+"""
+    Slixmpp: The Slick XMPP Library
+    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of slixmpp.
+
+    See the file LICENSE for copying permission.
+"""
+
+from slixmpp.xmlstream import ET, ElementBase
+
+
+class UserSettings(ElementBase):
+    name = 'usersetting'
+    namespace = 'google:setting'
+    plugin_attrib = 'google_settings'
+    interfaces = set(['auto_accept_suggestions',
+                      'mail_notifications',
+                      'archiving_enabled',
+                      'gmail',
+                      'email_verified',
+                      'domain_privacy_notice',
+                      'display_name'])
+
+    def _get_setting(self, setting):
+        xml = self.xml.find('{%s}%s' % (self.namespace, setting))
+        if xml is not None:
+            return xml.attrib.get('value', '') == 'true'
+        return False
+
+    def _set_setting(self, setting, value):
+        self._del_setting(setting)
+        if value in (True, False):
+            xml = ET.Element('{%s}%s' % (self.namespace, setting))
+            xml.attrib['value'] = 'true' if value else 'false'
+            self.xml.append(xml)
+
+    def _del_setting(self, setting):
+        xml = self.xml.find('{%s}%s' % (self.namespace, setting))
+        if xml is not None:
+            self.xml.remove(xml)
+
+    def get_display_name(self):
+        xml = self.xml.find('{%s}%s' % (self.namespace, 'displayname'))
+        if xml is not None:
+            return xml.attrib.get('value', '')
+        return ''
+
+    def set_display_name(self, value):
+        self._del_setting(setting)
+        if value:
+            xml = ET.Element('{%s}%s' % (self.namespace, 'displayname'))
+            xml.attrib['value'] = value
+            self.xml.append(xml)
+
+    def del_display_name(self):
+        self._del_setting('displayname')
+
+    def get_auto_accept_suggestions(self):
+        return self._get_setting('autoacceptsuggestions')
+
+    def get_mail_notifications(self):
+        return self._get_setting('mailnotifications')
+
+    def get_archiving_enabled(self):
+        return self._get_setting('archivingenabled')
+
+    def get_gmail(self):
+        return self._get_setting('gmail')
+
+    def get_email_verified(self):
+        return self._get_setting('emailverified')
+
+    def get_domain_privacy_notice(self):
+        return self._get_setting('domainprivacynotice')
+
+    def set_auto_accept_suggestions(self, value):
+        self._set_setting('autoacceptsuggestions', value)
+
+    def set_mail_notifications(self, value):
+        self._set_setting('mailnotifications', value)
+
+    def set_archiving_enabled(self, value):
+        self._set_setting('archivingenabled', value)
+
+    def set_gmail(self, value):
+        self._set_setting('gmail', value)
+
+    def set_email_verified(self, value):
+        self._set_setting('emailverified', value)
+
+    def set_domain_privacy_notice(self, value):
+        self._set_setting('domainprivacynotice', value)
+
+    def del_auto_accept_suggestions(self):
+        self._del_setting('autoacceptsuggestions')
+
+    def del_mail_notifications(self):
+        self._del_setting('mailnotifications')
+
+    def del_archiving_enabled(self):
+        self._del_setting('archivingenabled')
+
+    def del_gmail(self):
+        self._del_setting('gmail')
+
+    def del_email_verified(self):
+        self._del_setting('emailverified')
+
+    def del_domain_privacy_notice(self):
+        self._del_setting('domainprivacynotice')

slixmpp/plugins/xep_0004/dataforms.py

@@ -23,7 +23,7 @@ class XEP_0004(BasePlugin):
 
     name = 'xep_0004'
     description = 'XEP-0004: Data Forms'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0004/stanza/field.py

@@ -14,21 +14,21 @@ class FormField(ElementBase):
     name = 'field'
     plugin_attrib = 'field'
     plugin_multi_attrib = 'fields'
-    interfaces = set(('answer', 'desc', 'required', 'value',
-                      'label', 'type', 'var'))
-    sub_interfaces = set(('desc',))
+    interfaces = {'answer', 'desc', 'required', 'value',
+                  'label', 'type', 'var'}
+    sub_interfaces = {'desc'}
     plugin_tag_map = {}
     plugin_attrib_map = {}
 
-    field_types = set(('boolean', 'fixed', 'hidden', 'jid-multi',
-                       'jid-single', 'list-multi', 'list-single',
-                       'text-multi', 'text-private', 'text-single'))
+    field_types = {'boolean', 'fixed', 'hidden', 'jid-multi',
+                   'jid-single', 'list-multi', 'list-single',
+                   'text-multi', 'text-private', 'text-single'}
 
-    true_values = set((True, '1', 'true'))
-    option_types = set(('list-multi', 'list-single'))
-    multi_line_types = set(('hidden', 'text-multi'))
-    multi_value_types = set(('hidden', 'jid-multi',
-                             'list-multi', 'text-multi'))
+    true_values = {True, '1', 'true'}
+    option_types = {'list-multi', 'list-single'}
+    multi_line_types = {'hidden', 'text-multi'}
+    multi_value_types = {'hidden', 'jid-multi',
+                         'list-multi', 'text-multi'}
 
     def setup(self, xml=None):
         if ElementBase.setup(self, xml):
@@ -164,8 +164,8 @@ class FieldOption(ElementBase):
     namespace = 'jabber:x:data'
     name = 'option'
     plugin_attrib = 'option'
-    interfaces = set(('label', 'value'))
-    sub_interfaces = set(('value',))
+    interfaces = {'label', 'value'}
+    sub_interfaces = {'value'}
     plugin_multi_attrib = 'options'
 
 

slixmpp/plugins/xep_0004/stanza/form.py

@@ -24,8 +24,8 @@ class Form(ElementBase):
     name = 'x'
     plugin_attrib = 'form'
     interfaces = OrderedSet(('instructions', 'reported', 'title', 'type', 'items', ))
-    sub_interfaces = set(('title',))
-    form_types = set(('cancel', 'form', 'result', 'submit'))
+    sub_interfaces = {'title'}
+    form_types = {'cancel', 'form', 'result', 'submit'}
 
     def __init__(self, *args, **kwargs):
         title = None

slixmpp/plugins/xep_0009/binding.py

@@ -92,13 +92,13 @@ def _py2xml(*args):
 def xml2py(params):
     namespace = 'jabber:iq:rpc'
     vals = []
-    for param in params.xml.findall('{%s}param' % namespace):
+    for param in params.findall('{%s}param' % namespace):
         vals.append(_xml2py(param.find('{%s}value' % namespace)))
     return vals
 
 def _xml2py(value):
     namespace = 'jabber:iq:rpc'
-    find_value = value.xml.find
+    find_value = value.find
     if find_value('{%s}nil' % namespace) is not None:
         return None
     if find_value('{%s}i4' % namespace) is not None:

slixmpp/plugins/xep_0009/rpc.py

@@ -24,7 +24,7 @@ class XEP_0009(BasePlugin):
 
     name = 'xep_0009'
     description = 'XEP-0009: Jabber-RPC'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):
@@ -121,7 +121,7 @@ class XEP_0009(BasePlugin):
     def _recipient_unvailable(self, iq):
         payload = iq.get_payload()
         iq = iq.reply()
-        error().set_payload(payload)
+        iq.error().set_payload(payload)
         iq['error']['code'] = '404'
         iq['error']['type'] = 'wait'
         iq['error']['condition'] = 'recipient-unavailable'

slixmpp/plugins/xep_0009/stanza/RPC.py

@@ -14,8 +14,8 @@ class RPCQuery(ElementBase):
     name = 'query'
     namespace = 'jabber:iq:rpc'
     plugin_attrib = 'rpc_query'
-    interfaces = set(())
-    subinterfaces = set(())
+    interfaces = {}
+    subinterfaces = {}
     plugin_attrib_map = {}
     plugin_tag_map = {}
 
@@ -24,8 +24,8 @@ class MethodCall(ElementBase):
     name = 'methodCall'
     namespace = 'jabber:iq:rpc'
     plugin_attrib = 'method_call'
-    interfaces = set(('method_name', 'params'))
-    subinterfaces = set(())
+    interfaces = {'method_name', 'params'}
+    subinterfaces = {}
     plugin_attrib_map = {}
     plugin_tag_map = {}
 
@@ -46,8 +46,8 @@ class MethodResponse(ElementBase):
     name = 'methodResponse'
     namespace = 'jabber:iq:rpc'
     plugin_attrib = 'method_response'
-    interfaces = set(('params', 'fault'))
-    subinterfaces = set(())
+    interfaces = {'params', 'fault'}
+    subinterfaces = {}
     plugin_attrib_map = {}
     plugin_tag_map = {}
 

slixmpp/plugins/xep_0012/last_activity.py

@@ -29,7 +29,7 @@ class XEP_0012(BasePlugin):
 
     name = 'xep_0012'
     description = 'XEP-0012: Last Activity'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0012/stanza.py

@@ -14,7 +14,7 @@ class LastActivity(ElementBase):
     name = 'query'
     namespace = 'jabber:iq:last'
     plugin_attrib = 'last_activity'
-    interfaces = set(('seconds', 'status'))
+    interfaces = {'seconds', 'status'}
 
     def get_seconds(self):
         return int(self._get_attr('seconds'))

slixmpp/plugins/xep_0013/offline.py

@@ -29,7 +29,7 @@ class XEP_0013(BasePlugin):
 
     name = 'xep_0013'
     description = 'XEP-0013: Flexible Offline Message Retrieval'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0013/stanza.py

@@ -14,7 +14,7 @@ class Offline(ElementBase):
     name = 'offline'
     namespace = 'http://jabber.org/protocol/offline'
     plugin_attrib = 'offline'
-    interfaces = set(['fetch', 'purge', 'results'])
+    interfaces = {'fetch', 'purge', 'results'}
     bool_interfaces = interfaces
 
     def setup(self, xml=None):
@@ -39,9 +39,9 @@ class Item(ElementBase):
     name = 'item'
     namespace = 'http://jabber.org/protocol/offline'
     plugin_attrib = 'item'
-    interfaces = set(['action', 'node', 'jid'])
+    interfaces = {'action', 'node', 'jid'}
 
-    actions = set(['view', 'remove'])
+    actions = {'view', 'remove'}
 
     def get_jid(self):
         return JID(self._get_attr('jid'))

slixmpp/plugins/xep_0016/privacy.py

@@ -17,7 +17,7 @@ class XEP_0016(BasePlugin):
 
     name = 'xep_0016'
     description = 'XEP-0016: Privacy Lists'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0016/stanza.py

@@ -18,14 +18,14 @@ class Active(ElementBase):
     name = 'active'
     namespace = 'jabber:iq:privacy'
     plugin_attrib = name
-    interfaces = set(['name'])
+    interfaces = {'name'}
 
 
 class Default(ElementBase):
     name = 'default'
     namespace = 'jabber:iq:privacy'
     plugin_attrib = name
-    interfaces = set(['name'])
+    interfaces = {'name'}
 
 
 class List(ElementBase):
@@ -33,7 +33,7 @@ class List(ElementBase):
     namespace = 'jabber:iq:privacy'
     plugin_attrib = name
     plugin_multi_attrib = 'lists'
-    interfaces = set(['name'])
+    interfaces = {'name'}
 
     def add_item(self, value, action, order, itype=None, iq=False,
                  message=False, presence_in=False, presence_out=False):
@@ -55,9 +55,9 @@ class Item(ElementBase):
     namespace = 'jabber:iq:privacy'
     plugin_attrib = name
     plugin_multi_attrib = 'items'
-    interfaces = set(['type', 'value', 'action', 'order', 'iq',
-                      'message', 'presence_in', 'presence_out'])
-    bool_interfaces = set(['message', 'iq', 'presence_in', 'presence_out'])
+    interfaces = {'type', 'value', 'action', 'order', 'iq',
+                  'message', 'presence_in', 'presence_out'}
+    bool_interfaces = {'message', 'iq', 'presence_in', 'presence_out'}
 
     type_values = ('', 'jid', 'group', 'subscription')
     action_values = ('allow', 'deny')

slixmpp/plugins/xep_0020/feature_negotiation.py

@@ -24,7 +24,7 @@ class XEP_0020(BasePlugin):
 
     name = 'xep_0020'
     description = 'XEP-0020: Feature Negotiation'
-    dependencies = set(['xep_0004', 'xep_0030'])
+    dependencies = {'xep_0004', 'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0027/stanza.py

@@ -13,7 +13,7 @@ class Signed(ElementBase):
     name = 'x'
     namespace = 'jabber:x:signed'
     plugin_attrib = 'signed'
-    interfaces = set(['signed'])
+    interfaces = {'signed'}
     is_extension = True
 
     def set_signed(self, value):
@@ -33,7 +33,7 @@ class Encrypted(ElementBase):
     name = 'x'
     namespace = 'jabber:x:encrypted'
     plugin_attrib = 'encrypted'
-    interfaces = set(['encrypted'])
+    interfaces = {'encrypted'}
     is_extension = True
 
     def set_encrypted(self, value):

slixmpp/plugins/xep_0030/stanza/info.py

@@ -71,8 +71,8 @@ class DiscoInfo(ElementBase):
     name = 'query'
     namespace = 'http://jabber.org/protocol/disco#info'
     plugin_attrib = 'disco_info'
-    interfaces = set(('node', 'features', 'identities'))
-    lang_interfaces = set(('identities',))
+    interfaces = {'node', 'features', 'identities'}
+    lang_interfaces = {'identities'}
 
     # Cache identities and features
     _identities = set()
@@ -91,7 +91,7 @@ class DiscoInfo(ElementBase):
         """
         ElementBase.setup(self, xml)
 
-        self._identities = set([id[0:3] for id in self['identities']])
+        self._identities = {id[0:3] for id in self['identities']}
         self._features = self['features']
 
     def add_identity(self, category, itype, name=None, lang=None):

slixmpp/plugins/xep_0030/stanza/items.py

@@ -45,7 +45,7 @@ class DiscoItems(ElementBase):
     name = 'query'
     namespace = 'http://jabber.org/protocol/disco#items'
     plugin_attrib = 'disco_items'
-    interfaces = set(('node', 'items'))
+    interfaces = {'node', 'items'}
 
     # Cache items
     _items = set()
@@ -62,7 +62,7 @@ class DiscoItems(ElementBase):
             xml -- Use an existing XML object for the stanza's values.
         """
         ElementBase.setup(self, xml)
-        self._items = set([item[0:2] for item in self['items']])
+        self._items = {item[0:2] for item in self['items']}
 
     def add_item(self, jid, node=None, name=None):
         """
@@ -138,7 +138,7 @@ class DiscoItem(ElementBase):
     name = 'item'
     namespace = 'http://jabber.org/protocol/disco#items'
     plugin_attrib = name
-    interfaces = set(('jid', 'node', 'name'))
+    interfaces = {'jid', 'node', 'name'}
 
     def get_node(self):
         """Return the item's node name or ``None``."""

slixmpp/plugins/xep_0033/addresses.py

@@ -22,7 +22,7 @@ class XEP_0033(BasePlugin):
 
     name = 'xep_0033'
     description = 'XEP-0033: Extended Stanza Addressing'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0033/stanza.py

@@ -37,9 +37,9 @@ class Address(ElementBase):
     name = 'address'
     namespace = 'http://jabber.org/protocol/address'
     plugin_attrib = 'address'
-    interfaces = set(['type', 'jid', 'node', 'uri', 'desc', 'delivered'])
+    interfaces = {'type', 'jid', 'node', 'uri', 'desc', 'delivered'}
 
-    address_types = set(('bcc', 'cc', 'noreply', 'replyroom', 'replyto', 'to'))
+    address_types = {'bcc', 'cc', 'noreply', 'replyroom', 'replyto', 'to'}
 
     def get_jid(self):
         return JID(self._get_attr('jid'))
@@ -117,9 +117,12 @@ for atype in ('all', 'bcc', 'cc', 'noreply', 'replyroom', 'replyto', 'to'):
     setattr(Addresses, "set_%s" % atype, set_multi)
     setattr(Addresses, "del_%s" % atype, del_multi)
 
-    # To retain backwards compatibility:
     if atype == 'all':
         Addresses.interfaces.add('addresses')
+        setattr(Addresses, "get_addresses", get_multi)
+        setattr(Addresses, "set_addresses", set_multi)
+        setattr(Addresses, "del_addresses", del_multi)
+
 
 
 register_stanza_plugin(Addresses, Address, iterable=True)

slixmpp/plugins/xep_0045.py

@@ -25,86 +25,86 @@ class MUCPresence(ElementBase):
     name = 'x'
     namespace = 'http://jabber.org/protocol/muc#user'
     plugin_attrib = 'muc'
-    interfaces = set(('affiliation', 'role', 'jid', 'nick', 'room'))
-    affiliations = set(('', ))
-    roles = set(('', ))
+    interfaces = {'affiliation', 'role', 'jid', 'nick', 'room'}
+    affiliations = {'', }
+    roles = {'', }
 
-    def getXMLItem(self):
+    def get_xml_item(self):
         item = self.xml.find('{http://jabber.org/protocol/muc#user}item')
         if item is None:
             item = ET.Element('{http://jabber.org/protocol/muc#user}item')
             self.xml.append(item)
         return item
 
-    def getAffiliation(self):
+    def get_affiliation(self):
         #TODO if no affilation, set it to the default and return default
-        item = self.getXMLItem()
+        item = self.get_xml_item()
         return item.get('affiliation', '')
 
-    def setAffiliation(self, value):
-        item = self.getXMLItem()
+    def set_affiliation(self, value):
+        item = self.get_xml_item()
         #TODO check for valid affiliation
         item.attrib['affiliation'] = value
         return self
 
-    def delAffiliation(self):
-        item = self.getXMLItem()
+    def del_affiliation(self):
+        item = self.get_xml_item()
         #TODO set default affiliation
         if 'affiliation' in item.attrib: del item.attrib['affiliation']
         return self
 
-    def getJid(self):
-        item = self.getXMLItem()
+    def get_jid(self):
+        item = self.get_xml_item()
         return JID(item.get('jid', ''))
 
-    def setJid(self, value):
-        item = self.getXMLItem()
+    def set_jid(self, value):
+        item = self.get_xml_item()
         if not isinstance(value, str):
             value = str(value)
         item.attrib['jid'] = value
         return self
 
-    def delJid(self):
-        item = self.getXMLItem()
+    def del_jid(self):
+        item = self.get_xml_item()
         if 'jid' in item.attrib: del item.attrib['jid']
         return self
 
-    def getRole(self):
-        item = self.getXMLItem()
+    def get_role(self):
+        item = self.get_xml_item()
         #TODO get default role, set default role if none
         return item.get('role', '')
 
-    def setRole(self, value):
-        item = self.getXMLItem()
+    def set_role(self, value):
+        item = self.get_xml_item()
         #TODO check for valid role
         item.attrib['role'] = value
         return self
 
-    def delRole(self):
-        item = self.getXMLItem()
+    def del_role(self):
+        item = self.get_xml_item()
         #TODO set default role
         if 'role' in item.attrib: del item.attrib['role']
         return self
 
-    def getNick(self):
+    def get_nick(self):
         return self.parent()['from'].resource
 
-    def getRoom(self):
+    def get_room(self):
         return self.parent()['from'].bare
 
-    def setNick(self, value):
+    def set_nick(self, value):
         log.warning("Cannot set nick through mucpresence plugin.")
         return self
 
-    def setRoom(self, value):
+    def set_room(self, value):
         log.warning("Cannot set room through mucpresence plugin.")
         return self
 
-    def delNick(self):
+    def del_nick(self):
         log.warning("Cannot delete nick through mucpresence plugin.")
         return self
 
-    def delRoom(self):
+    def del_room(self):
         log.warning("Cannot delete room through mucpresence plugin.")
         return self
 
@@ -117,11 +117,11 @@ class XEP_0045(BasePlugin):
 
     name = 'xep_0045'
     description = 'XEP-0045: Multi-User Chat'
-    dependencies = set(['xep_0030', 'xep_0004'])
+    dependencies = {'xep_0030', 'xep_0004'}
 
     def plugin_init(self):
         self.rooms = {}
-        self.ourNicks = {}
+        self.our_nicks = {}
         self.xep = '0045'
         # load MUC support in presence stanzas
         register_stanza_plugin(Presence, MUCPresence)
@@ -201,22 +201,22 @@ class XEP_0045(BasePlugin):
         """
         self.xmpp.event('groupchat_subject', msg)
 
-    def jidInRoom(self, room, jid):
+    def jid_in_room(self, room, jid):
         for nick in self.rooms[room]:
             entry = self.rooms[room][nick]
             if entry is not None and entry['jid'].full == jid:
                 return True
         return False
 
-    def getNick(self, room, jid):
+    def get_nick(self, room, jid):
         for nick in self.rooms[room]:
             entry = self.rooms[room][nick]
             if entry is not None and entry['jid'].full == jid:
                 return nick
 
-    def configureRoom(self, room, form=None, ifrom=None):
+    def configure_room(self, room, form=None, ifrom=None):
         if form is None:
-            form = self.getRoomConfig(room, ifrom=ifrom)
+            form = self.get_room_config(room, ifrom=ifrom)
         iq = self.xmpp.make_iq_set()
         iq['to'] = room
         if ifrom is not None:
@@ -234,7 +234,7 @@ class XEP_0045(BasePlugin):
             return False
         return True
 
-    def joinMUC(self, room, nick, maxhistory="0", password='', wait=False, pstatus=None, pshow=None, pfrom=None):
+    def join_muc(self, room, nick, maxhistory="0", password='', wait=False, pstatus=None, pshow=None, pfrom=None):
         """ Join the specified room, requesting 'maxhistory' lines of history.
         """
         stanza = self.xmpp.make_presence(pto="%s/%s" % (room, nick), pstatus=pstatus, pshow=pshow, pfrom=pfrom)
@@ -258,7 +258,7 @@ class XEP_0045(BasePlugin):
             expect = ET.Element("{%s}presence" % self.xmpp.default_ns, {'from':"%s/%s" % (room, nick)})
             self.xmpp.send(stanza, expect)
         self.rooms[room] = {}
-        self.ourNicks[room] = nick
+        self.our_nicks[room] = nick
 
     def destroy(self, room, reason='', altroom = '', ifrom=None):
         iq = self.xmpp.make_iq_set()
@@ -283,7 +283,7 @@ class XEP_0045(BasePlugin):
             return False
         return True
 
-    def setAffiliation(self, room, jid=None, nick=None, affiliation='member', ifrom=None):
+    def set_affiliation(self, room, jid=None, nick=None, affiliation='member', ifrom=None):
         """ Change room affiliation."""
         if affiliation not in ('outcast', 'member', 'admin', 'owner', 'none'):
             raise TypeError
@@ -305,7 +305,7 @@ class XEP_0045(BasePlugin):
             return False
         return True
 
-    def setRole(self, room, nick, role):
+    def set_role(self, room, nick, role):
         """ Change role property of a nick in a room.
             Typically, roles are temporary (they last only as long as you are in the
             room), whereas affiliations are permanent (they last across groupchat
@@ -337,7 +337,7 @@ class XEP_0045(BasePlugin):
         msg.append(x)
         self.xmpp.send(msg)
 
-    def leaveMUC(self, room, nick, msg='', pfrom=None):
+    def leave_muc(self, room, nick, msg='', pfrom=None):
         """ Leave the specified room.
         """
         if msg:
@@ -346,7 +346,7 @@ class XEP_0045(BasePlugin):
             self.xmpp.send_presence(pshow='unavailable', pto="%s/%s" % (room, nick), pfrom=pfrom)
         del self.rooms[room]
 
-    def getRoomConfig(self, room, ifrom=''):
+    def get_room_config(self, room, ifrom=''):
         iq = self.xmpp.make_iq_get('http://jabber.org/protocol/muc#owner')
         iq['to'] = room
         iq['from'] = ifrom
@@ -362,7 +362,7 @@ class XEP_0045(BasePlugin):
             raise ValueError
         return self.xmpp.plugin['xep_0004'].build_form(form)
 
-    def cancelConfig(self, room, ifrom=None):
+    def cancel_config(self, room, ifrom=None):
         query = ET.Element('{http://jabber.org/protocol/muc#owner}query')
         x = ET.Element('{jabber:x:data}x', type='cancel')
         query.append(x)
@@ -371,7 +371,7 @@ class XEP_0045(BasePlugin):
         iq['from'] = ifrom
         iq.send()
 
-    def setRoomConfig(self, room, config, ifrom=''):
+    def set_room_config(self, room, config, ifrom=''):
         query = ET.Element('{http://jabber.org/protocol/muc#owner}query')
         config['type'] = 'submit'
         query.append(config)
@@ -380,31 +380,31 @@ class XEP_0045(BasePlugin):
         iq['from'] = ifrom
         iq.send()
 
-    def getJoinedRooms(self):
+    def get_joined_rooms(self):
         return self.rooms.keys()
 
-    def getOurJidInRoom(self, roomJid):
+    def get_our_jid_in_room(self, room_jid):
         """ Return the jid we're using in a room.
         """
-        return "%s/%s" % (roomJid, self.ourNicks[roomJid])
+        return "%s/%s" % (room_jid, self.our_nicks[room_jid])
 
-    def getJidProperty(self, room, nick, jidProperty):
+    def get_jid_property(self, room, nick, jid_property):
         """ Get the property of a nick in a room, such as its 'jid' or 'affiliation'
             If not found, return None.
         """
-        if room in self.rooms and nick in self.rooms[room] and jidProperty in self.rooms[room][nick]:
-            return self.rooms[room][nick][jidProperty]
+        if room in self.rooms and nick in self.rooms[room] and jid_property in self.rooms[room][nick]:
+            return self.rooms[room][nick][jid_property]
         else:
             return None
 
-    def getRoster(self, room):
+    def get_roster(self, room):
         """ Get the list of nicks in a room.
         """
         if room not in self.rooms.keys():
             return None
         return self.rooms[room].keys()
 
-    def getUsersByAffiliation(cls, room, affiliation='member', ifrom=None):
+    def get_users_by_affiliation(cls, room, affiliation='member', ifrom=None):
         if affiliation not in ('outcast', 'member', 'admin', 'owner', 'none'):
             raise TypeError
         query = ET.Element('{http://jabber.org/protocol/muc#admin}query')
@@ -415,5 +415,4 @@ class XEP_0045(BasePlugin):
         return iq.send()
 
 
-xep_0045 = XEP_0045
 register_plugin(XEP_0045)

slixmpp/plugins/xep_0047/ibb.py

@@ -18,7 +18,7 @@ class XEP_0047(BasePlugin):
 
     name = 'xep_0047'
     description = 'XEP-0047: In-band Bytestreams'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
     default_config = {
         'block_size': 4096,

slixmpp/plugins/xep_0047/stanza.py

@@ -21,7 +21,7 @@ class Open(ElementBase):
     name = 'open'
     namespace = 'http://jabber.org/protocol/ibb'
     plugin_attrib = 'ibb_open'
-    interfaces = set(('block_size', 'sid', 'stanza'))
+    interfaces = {'block_size', 'sid', 'stanza'}
 
     def get_block_size(self):
         return int(self._get_attr('block-size', '0'))
@@ -37,8 +37,8 @@ class Data(ElementBase):
     name = 'data'
     namespace = 'http://jabber.org/protocol/ibb'
     plugin_attrib = 'ibb_data'
-    interfaces = set(('seq', 'sid', 'data'))
-    sub_interfaces = set(['data'])
+    interfaces = {'seq', 'sid', 'data'}
+    sub_interfaces = {'data'}
 
     def get_seq(self):
         return int(self._get_attr('seq', '0'))
@@ -67,4 +67,4 @@ class Close(ElementBase):
     name = 'close'
     namespace = 'http://jabber.org/protocol/ibb'
     plugin_attrib = 'ibb_close'
-    interfaces = set(['sid'])
+    interfaces = {'sid'}

slixmpp/plugins/xep_0048/bookmarks.py

@@ -24,7 +24,7 @@ class XEP_0048(BasePlugin):
 
     name = 'xep_0048'
     description = 'XEP-0048: Bookmarks'
-    dependencies = set(['xep_0045', 'xep_0049', 'xep_0060', 'xep_0163', 'xep_0223'])
+    dependencies = {'xep_0045', 'xep_0049', 'xep_0060', 'xep_0163', 'xep_0223'}
     stanza = stanza
     default_config = {
         'auto_join': False,
@@ -59,7 +59,7 @@ class XEP_0048(BasePlugin):
         for conf in bookmarks['conferences']:
             if conf['autojoin']:
                 log.debug('Auto joining %s as %s', conf['jid'], conf['nick'])
-                self.xmpp['xep_0045'].joinMUC(conf['jid'], conf['nick'],
+                self.xmpp['xep_0045'].join_muc(conf['jid'], conf['nick'],
                         password=conf['password'])
 
     def set_bookmarks(self, bookmarks, method=None, **iqargs):

slixmpp/plugins/xep_0048/stanza.py

@@ -40,8 +40,8 @@ class Conference(ElementBase):
     namespace = 'storage:bookmarks'
     plugin_attrib = 'conference'
     plugin_multi_attrib = 'conferences'
-    interfaces = set(['nick', 'password', 'autojoin', 'jid', 'name'])
-    sub_interfaces = set(['nick', 'password'])
+    interfaces = {'nick', 'password', 'autojoin', 'jid', 'name'}
+    sub_interfaces = {'nick', 'password'}
 
     def get_autojoin(self):
         value = self._get_attr('autojoin')
@@ -58,7 +58,7 @@ class URL(ElementBase):
     namespace = 'storage:bookmarks'
     plugin_attrib = 'url'
     plugin_multi_attrib = 'urls'
-    interfaces = set(['url', 'name'])
+    interfaces = {'url', 'name'}
 
 
 register_stanza_plugin(Bookmarks, Conference, iterable=True)

slixmpp/plugins/xep_0049/private_storage.py

@@ -23,7 +23,7 @@ class XEP_0049(BasePlugin):
 
     name = 'xep_0049'
     description = 'XEP-0049: Private XML Storage'
-    dependencies = set([])
+    dependencies = {}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0050/adhoc.py

@@ -74,7 +74,7 @@ class XEP_0050(BasePlugin):
 
     name = 'xep_0050'
     description = 'XEP-0050: Ad-Hoc Commands'
-    dependencies = set(['xep_0030', 'xep_0004'])
+    dependencies = {'xep_0030', 'xep_0004'}
     stanza = stanza
     default_config = {
         'session_db': None
@@ -225,8 +225,8 @@ class XEP_0050(BasePlugin):
         if len(payload) == 1:
             payload = payload[0]
 
-        interfaces = set([item.plugin_attrib for item in payload])
-        payload_classes = set([item.__class__ for item in payload])
+        interfaces = {item.plugin_attrib for item in payload}
+        payload_classes = {item.__class__ for item in payload}
 
         initial_session = {'id': sessionid,
                            'from': iq['from'],
@@ -322,8 +322,8 @@ class XEP_0050(BasePlugin):
         interfaces = session.get('interfaces', set())
         payload_classes = session.get('payload_classes', set())
 
-        interfaces.update(set([item.plugin_attrib for item in payload]))
-        payload_classes.update(set([item.__class__ for item in payload]))
+        interfaces.update({item.plugin_attrib for item in payload})
+        payload_classes.update({item.__class__ for item in payload})
 
         session['interfaces'] = interfaces
         session['payload_classes'] = payload_classes

slixmpp/plugins/xep_0050/stanza.py

@@ -72,11 +72,11 @@ class Command(ElementBase):
     name = 'command'
     namespace = 'http://jabber.org/protocol/commands'
     plugin_attrib = 'command'
-    interfaces = set(('action', 'sessionid', 'node',
-                      'status', 'actions', 'notes'))
-    actions = set(('cancel', 'complete', 'execute', 'next', 'prev'))
-    statuses = set(('canceled', 'completed', 'executing'))
-    next_actions = set(('prev', 'next', 'complete'))
+    interfaces = {'action', 'sessionid', 'node',
+                  'status', 'actions', 'notes'}
+    actions = {'cancel', 'complete', 'execute', 'next', 'prev'}
+    statuses = {'canceled', 'completed', 'executing'}
+    next_actions = {'prev', 'next', 'complete'}
 
     def get_action(self):
         """
@@ -136,7 +136,7 @@ class Command(ElementBase):
              ('error', 'The command ran, but had errors')]
         """
         notes = []
-        notes_xml = self.findall('{%s}note' % self.namespace)
+        notes_xml = self.xml.findall('{%s}note' % self.namespace)
         for note in notes_xml:
             notes.append((note.attrib.get('type', 'info'),
                           note.text))
@@ -167,7 +167,7 @@ class Command(ElementBase):
         """
         Remove all notes associated with the command result.
         """
-        notes_xml = self.findall('{%s}note' % self.namespace)
+        notes_xml = self.xml.findall('{%s}note' % self.namespace)
         for note in notes_xml:
             self.xml.remove(note)
 

slixmpp/plugins/xep_0054/stanza.py

@@ -10,15 +10,15 @@ class VCardTemp(ElementBase):
     name = 'vCard'
     namespace = 'vcard-temp'
     plugin_attrib = 'vcard_temp'
-    interfaces = set(['FN', 'VERSION'])
-    sub_interfaces = set(['FN', 'VERSION'])
+    interfaces = {'FN', 'VERSION'}
+    sub_interfaces = {'FN', 'VERSION'}
 
 
 class Name(ElementBase):
     name = 'N'
     namespace = 'vcard-temp'
     plugin_attrib = name
-    interfaces = set(['FAMILY', 'GIVEN', 'MIDDLE', 'PREFIX', 'SUFFIX'])
+    interfaces = {'FAMILY', 'GIVEN', 'MIDDLE', 'PREFIX', 'SUFFIX'}
     sub_interfaces = interfaces
 
     def _set_component(self, name, value):
@@ -72,7 +72,7 @@ class Nickname(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'nicknames'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_nickname(self, value):
@@ -95,9 +95,9 @@ class Email(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'emails'
-    interfaces = set(['HOME', 'WORK', 'INTERNET', 'PREF', 'X400', 'USERID'])
-    sub_interfaces = set(['USERID'])
-    bool_interfaces = set(['HOME', 'WORK', 'INTERNET', 'PREF', 'X400'])
+    interfaces = {'HOME', 'WORK', 'INTERNET', 'PREF', 'X400', 'USERID'}
+    sub_interfaces = {'USERID'}
+    bool_interfaces = {'HOME', 'WORK', 'INTERNET', 'PREF', 'X400'}
 
 
 class Address(ElementBase):
@@ -105,12 +105,12 @@ class Address(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'addresses'
-    interfaces = set(['HOME', 'WORK', 'POSTAL', 'PARCEL', 'DOM', 'INTL',
-                      'PREF', 'POBOX', 'EXTADD', 'STREET', 'LOCALITY',
-                      'REGION', 'PCODE', 'CTRY'])
-    sub_interfaces = set(['POBOX', 'EXTADD', 'STREET', 'LOCALITY',
-                          'REGION', 'PCODE', 'CTRY'])
-    bool_interfaces = set(['HOME', 'WORK', 'DOM', 'INTL', 'PREF'])
+    interfaces = {'HOME', 'WORK', 'POSTAL', 'PARCEL', 'DOM', 'INTL',
+                  'PREF', 'POBOX', 'EXTADD', 'STREET', 'LOCALITY',
+                  'REGION', 'PCODE', 'CTRY'}
+    sub_interfaces = {'POBOX', 'EXTADD', 'STREET', 'LOCALITY',
+                      'REGION', 'PCODE', 'CTRY'}
+    bool_interfaces = {'HOME', 'WORK', 'DOM', 'INTL', 'PREF'}
 
 
 class Telephone(ElementBase):
@@ -118,16 +118,16 @@ class Telephone(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'telephone_numbers'
-    interfaces = set(['HOME', 'WORK', 'VOICE', 'FAX', 'PAGER', 'MSG',
-                      'CELL', 'VIDEO', 'BBS', 'MODEM', 'ISDN', 'PCS',
-                      'PREF', 'NUMBER'])
-    sub_interfaces = set(['NUMBER'])
-    bool_interfaces = set(['HOME', 'WORK', 'VOICE', 'FAX', 'PAGER',
-                           'MSG', 'CELL', 'VIDEO', 'BBS', 'MODEM',
-                           'ISDN', 'PCS', 'PREF'])
+    interfaces = {'HOME', 'WORK', 'VOICE', 'FAX', 'PAGER', 'MSG',
+                  'CELL', 'VIDEO', 'BBS', 'MODEM', 'ISDN', 'PCS',
+                  'PREF', 'NUMBER'}
+    sub_interfaces = {'NUMBER'}
+    bool_interfaces = {'HOME', 'WORK', 'VOICE', 'FAX', 'PAGER',
+                       'MSG', 'CELL', 'VIDEO', 'BBS', 'MODEM',
+                       'ISDN', 'PCS', 'PREF'}
 
     def setup(self, xml=None):
-        super(Telephone, self).setup(xml=xml)
+        super().setup(xml=xml)
         ## this blanks out numbers received from server
         ##self._set_sub_text('NUMBER', '', keep=True)
 
@@ -143,10 +143,10 @@ class Label(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'labels'
-    interfaces = set(['HOME', 'WORK', 'POSTAL', 'PARCEL', 'DOM', 'INT',
-                      'PREF', 'lines'])
-    bool_interfaces = set(['HOME', 'WORK', 'POSTAL', 'PARCEL', 'DOM',
-                           'INT', 'PREF'])
+    interfaces = {'HOME', 'WORK', 'POSTAL', 'PARCEL', 'DOM', 'INT',
+                  'PREF', 'lines'}
+    bool_interfaces = {'HOME', 'WORK', 'POSTAL', 'PARCEL', 'DOM',
+                       'INT', 'PREF'}
 
     def add_line(self, value):
         line = ET.Element('{%s}LINE' % self.namespace)
@@ -177,7 +177,7 @@ class Geo(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'geolocations'
-    interfaces = set(['LAT', 'LON'])
+    interfaces = {'LAT', 'LON'}
     sub_interfaces = interfaces
 
 
@@ -186,8 +186,8 @@ class Org(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'organizations'
-    interfaces = set(['ORGNAME', 'ORGUNIT', 'orgunits'])
-    sub_interfaces = set(['ORGNAME', 'ORGUNIT'])
+    interfaces = {'ORGNAME', 'ORGUNIT', 'orgunits'}
+    sub_interfaces = {'ORGNAME', 'ORGUNIT'}
 
     def add_orgunit(self, value):
         orgunit = ET.Element('{%s}ORGUNIT' % self.namespace)
@@ -218,7 +218,7 @@ class Photo(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'photos'
-    interfaces = set(['TYPE', 'EXTVAL'])
+    interfaces = {'TYPE', 'EXTVAL'}
     sub_interfaces = interfaces
 
 
@@ -227,7 +227,7 @@ class Logo(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'logos'
-    interfaces = set(['TYPE', 'EXTVAL'])
+    interfaces = {'TYPE', 'EXTVAL'}
     sub_interfaces = interfaces
 
 
@@ -236,7 +236,7 @@ class Sound(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'sounds'
-    interfaces = set(['PHONETC', 'EXTVAL'])
+    interfaces = {'PHONETC', 'EXTVAL'}
     sub_interfaces = interfaces
 
 
@@ -244,7 +244,7 @@ class BinVal(ElementBase):
     name = 'BINVAL'
     namespace = 'vcard-temp'
     plugin_attrib = name
-    interfaces = set(['BINVAL'])
+    interfaces = {'BINVAL'}
     is_extension = True
 
     def setup(self, xml=None):
@@ -275,7 +275,7 @@ class Classification(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'classifications'
-    interfaces = set(['PUBLIC', 'PRIVATE', 'CONFIDENTIAL'])
+    interfaces = {'PUBLIC', 'PRIVATE', 'CONFIDENTIAL'}
     bool_interfaces = interfaces
 
 
@@ -284,7 +284,7 @@ class Categories(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'categories'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_categories(self, values):
@@ -314,7 +314,7 @@ class Birthday(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'birthdays'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_bday(self, value):
@@ -336,7 +336,7 @@ class Rev(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'revision_dates'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_rev(self, value):
@@ -358,7 +358,7 @@ class Title(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'titles'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_title(self, value):
@@ -373,7 +373,7 @@ class Role(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'roles'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_role(self, value):
@@ -388,7 +388,7 @@ class Note(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'notes'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_note(self, value):
@@ -403,7 +403,7 @@ class Desc(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'descriptions'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_desc(self, value):
@@ -418,7 +418,7 @@ class URL(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'urls'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_url(self, value):
@@ -433,7 +433,7 @@ class UID(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'uids'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_uid(self, value):
@@ -448,7 +448,7 @@ class ProdID(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'product_ids'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_prodid(self, value):
@@ -463,7 +463,7 @@ class Mailer(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'mailers'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_mailer(self, value):
@@ -478,7 +478,7 @@ class SortString(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = 'SORT_STRING'
     plugin_multi_attrib = 'sort_strings'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_sort_string(self, value):
@@ -493,7 +493,7 @@ class Agent(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'agents'
-    interfaces = set(['EXTVAL'])
+    interfaces = {'EXTVAL'}
     sub_interfaces = interfaces
 
 
@@ -502,7 +502,7 @@ class JabberID(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'jids'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_jabberid(self, value):
@@ -517,7 +517,7 @@ class TimeZone(ElementBase):
     namespace = 'vcard-temp'
     plugin_attrib = name
     plugin_multi_attrib = 'timezones'
-    interfaces = set([name])
+    interfaces = {name}
     is_extension = True
 
     def set_tz(self, value):

slixmpp/plugins/xep_0054/vcard_temp.py

@@ -29,7 +29,7 @@ class XEP_0054(BasePlugin):
 
     name = 'xep_0054'
     description = 'XEP-0054: vcard-temp'
-    dependencies = set(['xep_0030', 'xep_0082'])
+    dependencies = {'xep_0030', 'xep_0082'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0059/rsm.py

@@ -111,7 +111,7 @@ class XEP_0059(BasePlugin):
 
     name = 'xep_0059'
     description = 'XEP-0059: Result Set Management'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0059/stanza.py

@@ -64,10 +64,10 @@ class Set(ElementBase):
     namespace = 'http://jabber.org/protocol/rsm'
     name = 'set'
     plugin_attrib = 'rsm'
-    sub_interfaces = set(('first', 'after', 'before', 'count',
-                          'index', 'last', 'max'))
-    interfaces = set(('first_index', 'first', 'after', 'before',
-                      'count', 'index', 'last', 'max'))
+    sub_interfaces = {'first', 'after', 'before', 'count',
+                      'index', 'last', 'max'}
+    interfaces = {'first_index', 'first', 'after', 'before',
+                  'count', 'index', 'last', 'max'}
 
     def set_first_index(self, val):
         fi = self.xml.find("{%s}first" % (self.namespace))

slixmpp/plugins/xep_0060/pubsub.py

@@ -26,7 +26,7 @@ class XEP_0060(BasePlugin):
 
     name = 'xep_0060'
     description = 'XEP-0060: Publish-Subscribe'
-    dependencies = set(['xep_0030', 'xep_0004', 'xep_0082', 'xep_0131'])
+    dependencies = {'xep_0030', 'xep_0004', 'xep_0082', 'xep_0131'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0060/stanza/base.py

@@ -11,7 +11,7 @@ from slixmpp.xmlstream import ET
 
 class OptionalSetting(object):
 
-    interfaces = set(('required',))
+    interfaces = {'required'}
 
     def set_required(self, value):
         if value in (True, 'true', 'True', '1'):

slixmpp/plugins/xep_0060/stanza/pubsub.py

@@ -23,14 +23,14 @@ class Affiliations(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'affiliations'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class Affiliation(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'affiliation'
     plugin_attrib = name
-    interfaces = set(('node', 'affiliation', 'jid'))
+    interfaces = {'node', 'affiliation', 'jid'}
 
     def set_jid(self, value):
         self._set_attr('jid', str(value))
@@ -43,7 +43,7 @@ class Subscription(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'subscription'
     plugin_attrib = name
-    interfaces = set(('jid', 'node', 'subscription', 'subid'))
+    interfaces = {'jid', 'node', 'subscription', 'subid'}
 
     def set_jid(self, value):
         self._set_attr('jid', str(value))
@@ -56,21 +56,21 @@ class Subscriptions(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'subscriptions'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class SubscribeOptions(ElementBase, OptionalSetting):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'subscribe-options'
     plugin_attrib = 'suboptions'
-    interfaces = set(('required',))
+    interfaces = {'required'}
 
 
 class Item(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'item'
     plugin_attrib = name
-    interfaces = set(('id', 'payload'))
+    interfaces = {'id', 'payload'}
 
     def set_payload(self, value):
         del self['payload']
@@ -95,7 +95,7 @@ class Items(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'items'
     plugin_attrib = name
-    interfaces = set(('node', 'max_items'))
+    interfaces = {'node', 'max_items'}
 
     def set_max_items(self, value):
         self._set_attr('max_items', str(value))
@@ -105,14 +105,14 @@ class Create(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'create'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class Default(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'default'
     plugin_attrib = name
-    interfaces = set(('node', 'type'))
+    interfaces = {'node', 'type'}
 
     def get_type(self):
         t = self._get_attr('type')
@@ -125,14 +125,14 @@ class Publish(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'publish'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class Retract(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'retract'
     plugin_attrib = name
-    interfaces = set(('node', 'notify'))
+    interfaces = {'node', 'notify'}
 
     def get_notify(self):
         notify = self._get_attr('notify')
@@ -156,7 +156,7 @@ class Unsubscribe(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'unsubscribe'
     plugin_attrib = name
-    interfaces = set(('node', 'jid', 'subid'))
+    interfaces = {'node', 'jid', 'subid'}
 
     def set_jid(self, value):
         self._set_attr('jid', str(value))
@@ -169,7 +169,7 @@ class Subscribe(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'subscribe'
     plugin_attrib = name
-    interfaces = set(('node', 'jid'))
+    interfaces = {'node', 'jid'}
 
     def set_jid(self, value):
         self._set_attr('jid', str(value))
@@ -182,7 +182,7 @@ class Configure(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'configure'
     plugin_attrib = name
-    interfaces = set(('node', 'type'))
+    interfaces = {'node', 'type'}
 
     def getType(self):
         t = self._get_attr('type')
@@ -195,7 +195,7 @@ class Options(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'options'
     plugin_attrib = name
-    interfaces = set(('jid', 'node', 'options'))
+    interfaces = {'jid', 'node', 'options'}
 
     def __init__(self, *args, **kwargs):
         ElementBase.__init__(self, *args, **kwargs)
@@ -206,7 +206,10 @@ class Options(ElementBase):
         return form
 
     def set_options(self, value):
-        self.xml.append(value)
+        if isinstance(value, ElementBase):
+            self.xml.append(value.xml)
+        else:
+            self.xml.append(value)
         return self
 
     def del_options(self):
@@ -224,7 +227,7 @@ class PublishOptions(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub'
     name = 'publish-options'
     plugin_attrib = 'publish_options'
-    interfaces = set(('publish_options',))
+    interfaces = {'publish_options'}
     is_extension = True
 
     def get_publish_options(self):
@@ -238,7 +241,10 @@ class PublishOptions(ElementBase):
         if value is None:
             self.del_publish_options()
         else:
-            self.xml.append(value)
+            if isinstance(value, ElementBase):
+                self.xml.append(value.xml)
+            else:
+                self.xml.append(value)
         return self
 
     def del_publish_options(self):

slixmpp/plugins/xep_0060/stanza/pubsub_errors.py

@@ -13,18 +13,18 @@ from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
 class PubsubErrorCondition(ElementBase):
 
     plugin_attrib = 'pubsub'
-    interfaces = set(('condition', 'unsupported'))
+    interfaces = {'condition', 'unsupported'}
     plugin_attrib_map = {}
     plugin_tag_map = {}
-    conditions = set(('closed-node', 'configuration-required', 'invalid-jid',
-                      'invalid-options', 'invalid-payload', 'invalid-subid',
-                      'item-forbidden', 'item-required', 'jid-required',
-                      'max-items-exceeded', 'max-nodes-exceeded',
-                      'nodeid-required', 'not-in-roster-group',
-                      'not-subscribed', 'payload-too-big',
-                      'payload-required', 'pending-subscription',
-                      'presence-subscription-required', 'subid-required',
-                      'too-many-subscriptions', 'unsupported'))
+    conditions = {'closed-node', 'configuration-required', 'invalid-jid',
+                  'invalid-options', 'invalid-payload', 'invalid-subid',
+                  'item-forbidden', 'item-required', 'jid-required',
+                  'max-items-exceeded', 'max-nodes-exceeded',
+                  'nodeid-required', 'not-in-roster-group',
+                  'not-subscribed', 'payload-too-big',
+                  'payload-required', 'pending-subscription',
+                  'presence-subscription-required', 'subid-required',
+                  'too-many-subscriptions', 'unsupported'}
     condition_ns = 'http://jabber.org/protocol/pubsub#errors'
 
     def setup(self, xml):

slixmpp/plugins/xep_0060/stanza/pubsub_event.py

@@ -25,7 +25,7 @@ class EventItem(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'item'
     plugin_attrib = name
-    interfaces = set(('id', 'payload', 'node', 'publisher'))
+    interfaces = {'id', 'payload', 'node', 'publisher'}
 
     def set_payload(self, value):
         self.xml.append(value)
@@ -44,56 +44,56 @@ class EventRetract(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'retract'
     plugin_attrib = name
-    interfaces = set(('id',))
+    interfaces = {'id'}
 
 
 class EventItems(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'items'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class EventCollection(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'collection'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class EventAssociate(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'associate'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class EventDisassociate(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'disassociate'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class EventConfiguration(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'configuration'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class EventPurge(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'purge'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class EventDelete(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'delete'
     plugin_attrib = name
-    interfaces = set(('node', 'redirect'))
+    interfaces = {'node', 'redirect'}
 
     def set_redirect(self, uri):
         del self['redirect']
@@ -117,7 +117,7 @@ class EventSubscription(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#event'
     name = 'subscription'
     plugin_attrib = name
-    interfaces = set(('node', 'expiry', 'jid', 'subid', 'subscription'))
+    interfaces = {'node', 'expiry', 'jid', 'subid', 'subscription'}
 
     def get_expiry(self):
         expiry = self._get_attr('expiry')

slixmpp/plugins/xep_0060/stanza/pubsub_owner.py

@@ -25,7 +25,7 @@ class DefaultConfig(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'default'
     plugin_attrib = name
-    interfaces = set(('node', 'config'))
+    interfaces = {'node', 'config'}
 
     def __init__(self, *args, **kwargs):
         ElementBase.__init__(self, *args, **kwargs)
@@ -41,7 +41,7 @@ class DefaultConfig(ElementBase):
 
 class OwnerAffiliations(Affiliations):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
     def append(self, affiliation):
         if not isinstance(affiliation, OwnerAffiliation):
@@ -51,40 +51,40 @@ class OwnerAffiliations(Affiliations):
 
 class OwnerAffiliation(Affiliation):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
-    interfaces = set(('affiliation', 'jid'))
+    interfaces = {'affiliation', 'jid'}
 
 
 class OwnerConfigure(Configure):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'configure'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class OwnerDefault(OwnerConfigure):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class OwnerDelete(ElementBase, OptionalSetting):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'delete'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class OwnerPurge(ElementBase, OptionalSetting):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'purge'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
 
 class OwnerRedirect(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'redirect'
     plugin_attrib = name
-    interfaces = set(('node', 'jid'))
+    interfaces = {'node', 'jid'}
 
     def set_jid(self, value):
         self._set_attr('jid', str(value))
@@ -97,7 +97,7 @@ class OwnerSubscriptions(Subscriptions):
     name = 'subscriptions'
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     plugin_attrib = name
-    interfaces = set(('node',))
+    interfaces = {'node'}
 
     def append(self, subscription):
         if not isinstance(subscription, OwnerSubscription):
@@ -109,7 +109,7 @@ class OwnerSubscription(ElementBase):
     namespace = 'http://jabber.org/protocol/pubsub#owner'
     name = 'subscription'
     plugin_attrib = name
-    interfaces = set(('jid', 'subscription'))
+    interfaces = {'jid', 'subscription'}
 
     def set_jid(self, value):
         self._set_attr('jid', str(value))

slixmpp/plugins/xep_0065/proxy.py

@@ -22,7 +22,7 @@ class XEP_0065(BasePlugin):
 
     name = 'xep_0065'
     description = "XEP-0065: SOCKS5 Bytestreams"
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     default_config = {
         'auto_accept': False
     }
@@ -55,6 +55,7 @@ class XEP_0065(BasePlugin):
         """Returns the socket associated to the SID."""
         return self._sessions.get(sid, None)
 
+    @asyncio.coroutine
     def handshake(self, to, ifrom=None, sid=None, timeout=None):
         """ Starts the handshake to establish the socks5 bytestreams
         connection.
@@ -104,6 +105,7 @@ class XEP_0065(BasePlugin):
             iq['socks'].add_streamhost(proxy, host, port)
         return iq.send(timeout=timeout, callback=callback)
 
+    @asyncio.coroutine
     def discover_proxies(self, jid=None, ifrom=None, timeout=None):
         """Auto-discover the JIDs of SOCKS5 proxies on an XMPP server."""
         if jid is None:

slixmpp/plugins/xep_0065/stanza.py

@@ -6,8 +6,8 @@ class Socks5(ElementBase):
     name = 'query'
     namespace = 'http://jabber.org/protocol/bytestreams'
     plugin_attrib = 'socks'
-    interfaces = set(['sid', 'activate'])
-    sub_interfaces = set(['activate'])
+    interfaces = {'sid', 'activate'}
+    sub_interfaces = {'activate'}
 
     def add_streamhost(self, jid, host, port):
         sh = StreamHost(parent=self)
@@ -21,7 +21,7 @@ class StreamHost(ElementBase):
     namespace = 'http://jabber.org/protocol/bytestreams'
     plugin_attrib = 'streamhost'
     plugin_multi_attrib = 'streamhosts'
-    interfaces = set(['host', 'jid', 'port'])
+    interfaces = {'host', 'jid', 'port'}
 
     def set_jid(self, value):
         return self._set_attr('jid', str(value))
@@ -34,7 +34,7 @@ class StreamHostUsed(ElementBase):
     name = 'streamhost-used'
     namespace = 'http://jabber.org/protocol/bytestreams'
     plugin_attrib = 'streamhost_used'
-    interfaces = set(['jid'])
+    interfaces = {'jid'}
 
     def set_jid(self, value):
         return self._set_attr('jid', str(value))

slixmpp/plugins/xep_0066/oob.py

@@ -44,7 +44,7 @@ class XEP_0066(BasePlugin):
 
     name = 'xep_0066'
     description = 'XEP-0066: Out of Band Data'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0066/stanza.py

@@ -17,8 +17,8 @@ class OOBTransfer(ElementBase):
     name = 'query'
     namespace = 'jabber:iq:oob'
     plugin_attrib = 'oob_transfer'
-    interfaces = set(('url', 'desc', 'sid'))
-    sub_interfaces = set(('url', 'desc'))
+    interfaces = {'url', 'desc', 'sid'}
+    sub_interfaces = {'url', 'desc'}
 
 
 class OOB(ElementBase):
@@ -29,5 +29,5 @@ class OOB(ElementBase):
     name = 'x'
     namespace = 'jabber:x:oob'
     plugin_attrib = 'oob'
-    interfaces = set(('url', 'desc'))
+    interfaces = {'url', 'desc'}
     sub_interfaces = interfaces

slixmpp/plugins/xep_0071/stanza.py

@@ -19,8 +19,8 @@ class XHTML_IM(ElementBase):
 
     namespace = 'http://jabber.org/protocol/xhtml-im'
     name = 'html'
-    interfaces = set(['body'])
-    lang_interfaces = set(['body'])
+    interfaces = {'body'}
+    lang_interfaces = {'body'}
     plugin_attrib = name
 
     def set_body(self, content, lang=None):

slixmpp/plugins/xep_0071/xhtml_im.py

@@ -17,7 +17,7 @@ class XEP_0071(BasePlugin):
 
     name = 'xep_0071'
     description = 'XEP-0071: XHTML-IM'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0077/register.py

@@ -26,7 +26,7 @@ class XEP_0077(BasePlugin):
 
     name = 'xep_0077'
     description = 'XEP-0077: In-Band Registration'
-    dependencies = set(['xep_0004', 'xep_0066'])
+    dependencies = {'xep_0004', 'xep_0066'}
     stanza = stanza
     default_config = {
         'create_account': True,

slixmpp/plugins/xep_0077/stanza.py

@@ -16,14 +16,14 @@ class Register(ElementBase):
     namespace = 'jabber:iq:register'
     name = 'query'
     plugin_attrib = 'register'
-    interfaces = set(('username', 'password', 'email', 'nick', 'name',
-                      'first', 'last', 'address', 'city', 'state', 'zip',
-                      'phone', 'url', 'date', 'misc', 'text', 'key',
-                      'registered', 'remove', 'instructions', 'fields'))
+    interfaces = {'username', 'password', 'email', 'nick', 'name',
+                  'first', 'last', 'address', 'city', 'state', 'zip',
+                  'phone', 'url', 'date', 'misc', 'text', 'key',
+                  'registered', 'remove', 'instructions', 'fields'}
     sub_interfaces = interfaces
-    form_fields = set(('username', 'password', 'email', 'nick', 'name',
-                       'first', 'last', 'address', 'city', 'state', 'zip',
-                       'phone', 'url', 'date', 'misc', 'text', 'key'))
+    form_fields = {'username', 'password', 'email', 'nick', 'name',
+                   'first', 'last', 'address', 'city', 'state', 'zip',
+                   'phone', 'url', 'date', 'misc', 'text', 'key'}
 
     def get_registered(self):
         present = self.xml.find('{%s}registered' % self.namespace)

slixmpp/plugins/xep_0078/stanza.py

@@ -13,8 +13,8 @@ class IqAuth(ElementBase):
     namespace = 'jabber:iq:auth'
     name = 'query'
     plugin_attrib = 'auth'
-    interfaces = set(('fields', 'username', 'password', 'resource', 'digest'))
-    sub_interfaces = set(('username', 'password', 'resource', 'digest'))
+    interfaces = {'fields', 'username', 'password', 'resource', 'digest'}
+    sub_interfaces = {'username', 'password', 'resource', 'digest'}
     plugin_tag_map = {}
     plugin_attrib_map = {}
 

slixmpp/plugins/xep_0079/amp.py

@@ -27,7 +27,7 @@ class XEP_0079(BasePlugin):
 
     name = 'xep_0079'
     description = 'XEP-0079: Advanced Message Processing'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0079/stanza.py

@@ -8,6 +8,7 @@
 
 from __future__ import unicode_literals
 
+from slixmpp import JID
 from slixmpp.xmlstream import ElementBase, register_stanza_plugin
 
 
@@ -15,7 +16,7 @@ class AMP(ElementBase):
     namespace = 'http://jabber.org/protocol/amp'
     name = 'amp'
     plugin_attrib = 'amp'
-    interfaces = set(['from', 'to', 'status', 'per_hop'])
+    interfaces = {'from', 'to', 'status', 'per_hop'}
 
     def get_from(self):
         return JID(self._get_attr('from'))
@@ -53,7 +54,7 @@ class Rule(ElementBase):
     name = 'rule'
     plugin_attrib = name
     plugin_multi_attrib = 'rules'
-    interfaces = set(['action', 'condition', 'value'])
+    interfaces = {'action', 'condition', 'value'}
 
 
 class InvalidRules(ElementBase):

slixmpp/plugins/xep_0080/geoloc.py

@@ -25,7 +25,7 @@ class XEP_0080(BasePlugin):
 
     name = 'xep_0080'
     description = 'XEP-0080: User Location'
-    dependencies = set(['xep_0163'])
+    dependencies = {'xep_0163'}
     stanza = stanza
 
     def plugin_end(self):

slixmpp/plugins/xep_0080/stanza.py

@@ -65,11 +65,11 @@ class Geoloc(ElementBase):
 
     namespace = 'http://jabber.org/protocol/geoloc'
     name = 'geoloc'
-    interfaces = set(('accuracy', 'alt', 'area', 'bearing', 'building',
-                      'country', 'countrycode', 'datum', 'dscription',
-                      'error', 'floor', 'lat', 'locality', 'lon',
-                      'postalcode', 'region', 'room', 'speed', 'street',
-                      'text', 'timestamp', 'uri'))
+    interfaces = {'accuracy', 'alt', 'area', 'bearing', 'building',
+                  'country', 'countrycode', 'datum', 'dscription',
+                  'error', 'floor', 'lat', 'locality', 'lon',
+                  'postalcode', 'region', 'room', 'speed', 'street',
+                  'text', 'timestamp', 'uri'}
     sub_interfaces = interfaces
     plugin_attrib = name
 

slixmpp/plugins/xep_0084/avatar.py

@@ -24,7 +24,7 @@ class XEP_0084(BasePlugin):
 
     name = 'xep_0084'
     description = 'XEP-0084: User Avatar'
-    dependencies = set(['xep_0163', 'xep_0060'])
+    dependencies = {'xep_0163', 'xep_0060'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0084/stanza.py

@@ -16,7 +16,7 @@ class Data(ElementBase):
     name = 'data'
     namespace = 'urn:xmpp:avatar:data'
     plugin_attrib = 'avatar_data'
-    interfaces = set(['value'])
+    interfaces = {'value'}
 
     def get_value(self):
         if self.xml.text:
@@ -63,7 +63,7 @@ class Info(ElementBase):
     namespace = 'urn:xmpp:avatar:metadata'
     plugin_attrib = 'info'
     plugin_multi_attrib = 'items'
-    interfaces = set(['bytes', 'height', 'id', 'type', 'url', 'width'])
+    interfaces = {'bytes', 'height', 'id', 'type', 'url', 'width'}
 
 
 class Pointer(ElementBase):

slixmpp/plugins/xep_0085/chat_states.py

@@ -28,7 +28,7 @@ class XEP_0085(BasePlugin):
 
     name = 'xep_0085'
     description = 'XEP-0085: Chat State Notifications'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0085/stanza.py

@@ -37,11 +37,11 @@ class ChatState(ElementBase):
     name = ''
     namespace = 'http://jabber.org/protocol/chatstates'
     plugin_attrib = 'chat_state'
-    interfaces = set(('chat_state',))
+    interfaces = {'chat_state'}
     sub_interfaces = interfaces
     is_extension = True
 
-    states = set(('active', 'composing', 'gone', 'inactive', 'paused'))
+    states = {'active', 'composing', 'gone', 'inactive', 'paused'}
 
     def setup(self, xml=None):
         self.xml = ET.Element('')

slixmpp/plugins/xep_0086/stanza.py

@@ -44,7 +44,7 @@ class LegacyError(ElementBase):
     name = 'legacy'
     namespace = Error.namespace
     plugin_attrib = name
-    interfaces = set(('condition',))
+    interfaces = {'condition'}
     overrides = ['set_condition']
 
     error_map = {'bad-request': ('modify', '400'),

slixmpp/plugins/xep_0091/stanza.py

@@ -18,7 +18,7 @@ class LegacyDelay(ElementBase):
     name = 'x'
     namespace = 'jabber:x:delay'
     plugin_attrib = 'legacy_delay'
-    interfaces = set(('from', 'stamp', 'text'))
+    interfaces = {'from', 'stamp', 'text'}
 
     def get_from(self):
         from_ = self._get_attr('from')

slixmpp/plugins/xep_0092/stanza.py

@@ -38,5 +38,5 @@ class Version(ElementBase):
     name = 'query'
     namespace = 'jabber:iq:version'
     plugin_attrib = 'software_version'
-    interfaces = set(('name', 'version', 'os'))
+    interfaces = {'name', 'version', 'os'}
     sub_interfaces = interfaces

slixmpp/plugins/xep_0092/version.py

@@ -28,7 +28,7 @@ class XEP_0092(BasePlugin):
 
     name = 'xep_0092'
     description = 'XEP-0092: Software Version'
-    dependencies = set(['xep_0030'])
+    dependencies = {'xep_0030'}
     stanza = stanza
     default_config = {
         'software_name': 'Slixmpp',

slixmpp/plugins/xep_0095/stanza.py

@@ -13,7 +13,7 @@ class SI(ElementBase):
     name = 'si'
     namespace = 'http://jabber.org/protocol/si'
     plugin_attrib = 'si'
-    interfaces = set(['id', 'mime_type', 'profile'])
+    interfaces = {'id', 'mime_type', 'profile'}
 
     def get_mime_type(self):
         return self._get_attr('mime-type', 'application/octet-stream')

slixmpp/plugins/xep_0095/stream_initiation.py

@@ -31,7 +31,7 @@ class XEP_0095(BasePlugin):
 
     name = 'xep_0095'
     description = 'XEP-0095: Stream Initiation'
-    dependencies = set(['xep_0020', 'xep_0030', 'xep_0047', 'xep_0065'])
+    dependencies = {'xep_0020', 'xep_0030', 'xep_0047', 'xep_0065'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0096/file_transfer.py

@@ -23,7 +23,7 @@ class XEP_0096(BasePlugin):
 
     name = 'xep_0096'
     description = 'XEP-0096: SI File Transfer'
-    dependencies = set(['xep_0095'])
+    dependencies = {'xep_0095'}
     stanza = stanza
 
     def plugin_init(self):

slixmpp/plugins/xep_0096/stanza.py

@@ -16,8 +16,8 @@ class File(ElementBase):
     name = 'file'
     namespace = 'http://jabber.org/protocol/si/profile/file-transfer'
     plugin_attrib = 'file'
-    interfaces = set(['name', 'size', 'date', 'hash', 'desc'])
-    sub_interfaces = set(['desc'])
+    interfaces = {'name', 'size', 'date', 'hash', 'desc'}
+    sub_interfaces = {'desc'}
 
     def set_size(self, value):
         self._set_attr('size', str(value))
@@ -36,7 +36,7 @@ class Range(ElementBase):
     name = 'range'
     namespace = 'http://jabber.org/protocol/si/profile/file-transfer'
     plugin_attrib = 'range'
-    interfaces = set(['length', 'offset'])
+    interfaces = {'length', 'offset'}
 
     def set_length(self, value):
         self._set_attr('length', str(value))