Merge branch 'develop' of https://github.com/fritzy/SleekXMPP into sleek-merge

Conflicts: README.rst examples/IoT_TestDevice.py examples/disco_browser.py setup.py sleekxmpp/jid.py sleekxmpp/plugins/google/auth/stanza.py sleekxmpp/plugins/google/gmail/notifications.py sleekxmpp/plugins/google/nosave/stanza.py sleekxmpp/plugins/google/settings/settings.py sleekxmpp/thirdparty/__init__.py sleekxmpp/thirdparty/socks.py sleekxmpp/thirdparty/statemachine.py sleekxmpp/util/__init__.py sleekxmpp/xmlstream/xmlstream.py slixmpp/basexmpp.py slixmpp/plugins/xep_0004/stanza/form.py slixmpp/plugins/xep_0009/rpc.py slixmpp/plugins/xep_0050/adhoc.py slixmpp/plugins/xep_0065/proxy.py slixmpp/plugins/xep_0084/stanza.py slixmpp/plugins/xep_0202/time.py slixmpp/plugins/xep_0323/sensordata.py slixmpp/plugins/xep_0325/control.py slixmpp/plugins/xep_0325/stanza/control.py slixmpp/roster/single.py slixmpp/stanza/atom.py slixmpp/stanza/rootstanza.py slixmpp/test/slixtest.py slixmpp/util/sasl/mechanisms.py slixmpp/version.py slixmpp/xmlstream/stanzabase.py tests/test_stanza_xep_0323.py tests/test_stanza_xep_0325.py tests/test_stream_xep_0323.py tests/test_stream_xep_0325.py
2015-09-23 23:15:09 +02:00
302 changed files with 1689 additions and 4087 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +0,0 @@
-test:
-  tags:
-    - docker
-  image: ubuntu:latest
-  script:
-    - apt update
-    - apt install -y python3 cython3 gpg
-    - ./run_tests.py
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 language: python
 python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
  - "3.4"
-  - "3.5"
-  - "3.6"
-  - "3.7-dev"
 install:
  - "pip install ."
 script: testall.py
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,14 +0,0 @@
-Contributing to the Slixmpp project
-===================================
-
-To contribute, the preferred way is to commit your changes on some
-publicly-available git repository (on a fork `on github
-<https://github.com/poezio/slixmpp>`_ or on your own repository) and to
-notify the developers with either:
- - a ticket `on the bug tracker <https://dev.poez.io/new>`_
- - a pull request on github
- - a simple message on `the XMPP MUC <xmpp:slixmpp@muc.poez.io>`_
-
-Even though Slixmpp’s github repository is just a read-only mirror, we can
-still be notified of the pull requests and fetch your mirror manually to
-integrate your changes.
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 Pre-requisites:
- Python 3.5+
+- Python 3.4
 - Cython 0.22 and libidn, optionally (making JID faster by compiling the stringprep module)

 Install:
--- a/README.rst
+++ b/README.rst
@@ -1,22 +1,13 @@
 Slixmpp
 #########

-Slixmpp is an MIT licensed XMPP library for Python 3.5+. It is a fork of
+Slixmpp is an MIT licensed XMPP library for Python 3.4+. It is a fork of
 SleekXMPP.

 Slixmpp's goals is to only rewrite the core of the library (the low level
 socket handling, the timers, the events dispatching) in order to remove all
 threads.

-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::
-
-    python3 setup.py build_ext --inplace
-
 Documentation and Testing
 -------------------------
 Documentation can be found both inline in the code, and as a Sphinx project in ``/docs``.
@@ -36,7 +27,7 @@ The Slixmpp Boilerplate
 -------------------------
 Projects using Slixmpp tend to follow a basic pattern for setting up client/component
 connections and configuration. Here is the gist of the boilerplate needed for a Slixmpp
-based project. See the documentation or examples directory for more detailed archetypes for
+based project. See the documetation or examples directory for more detailed archetypes for
 Slixmpp projects::

    import logging
@@ -102,17 +93,8 @@ Slixmpp projects::
 Slixmpp Credits
 ---------------

-**Maintainers:**
-    - Florent Le Coz (`louiz@louiz.org <xmpp:louiz@louiz.org?message>`_),
-    - Mathieu Pasquet (`mathieui@mathieui.net <xmpp:mathieui@mathieui.net?message>`_),
-
-**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>`_)
+**Maintainer of the slixmpp fork:** Florent Le Coz
+    `louiz@louiz.org <xmpp:louiz@louiz.org?message>`_,

 Credits (SleekXMPP)
 -------------------
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2011, Nathan Fritz, Lance Stout'
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.1'
+release = '1.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/docs/create_plugin.rst
+++ b/docs/create_plugin.rst
@@ -163,7 +163,7 @@ behaviour:
        namespace = 'jabber:iq:register'
        name = 'query'
        plugin_attrib = 'register'
-        interfaces = {'username', 'password', 'registered', 'remove'}
+        interfaces = set(('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 = {'username', 'password', 'email', 'nick', 'name',
-                      'first', 'last', 'address', 'city', 'state', 'zip',
-                      'phone', 'url', 'date', 'misc', 'text', 'key',
-                      'registered', 'remove', 'instructions'}
+        interfaces = set(('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):
--- a/docs/differences.rst
+++ b/docs/differences.rst
@@ -3,8 +3,8 @@
 Differences from SleekXMPP
 ==========================

-**Python 3.5+ only**
-    slixmpp will only work on python 3.5 and above.
+**Python 3.4+ only**
+    slixmpp will only work on python 3.4 and above.

 **Stanza copies**
    The same stanza object is given through all the handlers; a handler that
--- a/docs/event_index.rst
+++ b/docs/event_index.rst
@@ -259,8 +259,8 @@ Event Index

        Signal that a connection to the XMPP server has been lost and the current
        stream session has ended. Currently equivalent to :term:`disconnected`, but
-        implementations of `XEP-0198: Stream Management <http://xmpp.org/extensions/xep-0198.html>`_
-        distinguish between the two events.
+        future implementation of `XEP-0198: Stream Management <http://xmpp.org/extensions/xep-0198.html>`_
+        will distinguish the two events.

        Plugins that maintain session-based state should clear themselves when
        this event is fired.
--- a/docs/getting_started/echobot.rst
+++ b/docs/getting_started/echobot.rst
@@ -70,7 +70,7 @@ as well.
    class EchoBot(slixmpp.ClientXMPP):

        def __init__(self, jid, password):
-            super().__init__(jid, password)
+            super(EchoBot, self).__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().__init__(jid, password)
+        super(EchoBot, self).__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().__init__(jid, password)
+        super(EchoBot, self).__init__(jid, password)

        self.add_event_handler('session_start', self.start)
        self.add_event_handler('message', self.message)
@@ -329,7 +329,7 @@ The Final Product
 -----------------

 Here then is what the final result should look like after working through the guide above. The code
-can also be found in the Slixmpp `examples directory <http://git.poez.io/slixmpp/tree/examples>`_.
+can also be found in the Slixmpp `examples directory <http://github.com/fritzy/Slixmpp/tree/master/examples>`_.

 .. compound::

--- a/docs/getting_started/muc.rst
+++ b/docs/getting_started/muc.rst
@@ -1,7 +1,7 @@
 .. _mucbot:

 =========================
-Multi-User Chat (MUC) Bot
+Mulit-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'].join_muc(self.room,
-                                         self.nick,
-                                         wait=True)
+        self.plugin['xep_0045'].joinMUC(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
-``join_muc`` method of the MUC plugin.
+``joinMUC`` method of the MUC plugin.

 .. note::

--- a/docs/getting_started/sendlogout.rst
+++ b/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().__init__(jid, password)
+            super(SendMsgBot, self).__init__(jid, password)

            self.recipient = recipient
            self.msg = msg
--- a/docs/guide_xep_0030.rst
+++ b/docs/guide_xep_0030.rst
@@ -61,7 +61,7 @@ operation using these stanzas without doing any complex operations such as
 checking an ACL, etc.

 You may find it necessary at some point to revert a particular node or JID to
-using the default, static handlers. To do so, use the method ``restore_defaults()``.
+using the default, static handlers. To do so, use the method ``make_static()``.
 You may also elect to only convert a given set of actions instead.

 Creating a Node Handler
@@ -162,7 +162,7 @@ item itself, and the JID and node that will own the item.
    parameters ``ijid`` and ``node``.

 Performing Disco Queries
------------------------
+-----------------------
 The methods ``get_info()`` and ``get_items()`` are used to query remote JIDs
 and their nodes for disco information. Since these methods are wrappers for
 sending Iq stanzas, they also accept all of the parameters of the ``Iq.send()``
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,7 +21,7 @@ Slixmpp
    which goal is to use asyncio instead of threads to handle networking. See
    :ref:`differences`.

-Slixmpp is an :ref:`MIT licensed <license>` XMPP library for Python 3.5+,
+Slixmpp is an :ref:`MIT licensed <license>` XMPP library for Python 3.4+,

 Slixmpp's design goals and philosphy are:

--- a/examples/adhoc_provider.py
+++ b/examples/adhoc_provider.py
@@ -68,7 +68,7 @@ class CommandBot(slixmpp.ClientXMPP):
                       session. Additional, custom data may be saved
                       here to persist across handler callbacks.
        """
-        form = self['xep_0004'].make_form('form', 'Greeting')
+        form = self['xep_0004'].makeForm('form', 'Greeting')
        form['instructions'] = 'Send a custom greeting to a JID'
        form.addField(var='greeting',
                      ftype='text-single',
--- a/examples/adhoc_user.py
+++ b/examples/adhoc_user.py
@@ -94,7 +94,7 @@ class CommandUserBot(slixmpp.ClientXMPP):
        #          label="Your greeting" />
        # </x>

-        form = self['xep_0004'].make_form(ftype='submit')
+        form = self['xep_0004'].makeForm(ftype='submit')
        form.addField(var='greeting',
                      value=session['greeting'])

--- a/examples/confirm_answer.py
+++ b/examples/confirm_answer.py
@@ -1,100 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-    Slixmpp: The Slick XMPP Library
-    Copyright (C) 2015 Emmanuel Gil Peyrot
-    This file is part of Slixmpp.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-from getpass import getpass
-from argparse import ArgumentParser
-
-import slixmpp
-from slixmpp.exceptions import XMPPError
-from slixmpp import asyncio
-
-log = logging.getLogger(__name__)
-
-
-class AnswerConfirm(slixmpp.ClientXMPP):
-
-    """
-    A basic client demonstrating how to confirm or deny an HTTP request.
-    """
-
-    def __init__(self, jid, password, trusted):
-        slixmpp.ClientXMPP.__init__(self, jid, password)
-
-        self.add_event_handler("http_confirm", self.confirm)
-        self.add_event_handler("session_start", self.start)
-
-    def start(self, *args):
-        self.make_presence().send()
-
-    def prompt(self, stanza):
-        confirm = stanza['confirm']
-        print('Received confirm request %s from %s to access %s using '
-                 'method %s' % (
-                     confirm['id'], stanza['from'], confirm['url'],
-                     confirm['method'])
-                )
-        result = input("Do you accept (y/N)? ")
-        return 'y' == result.lower()
-
-    def confirm(self, stanza):
-        if self.prompt(stanza):
-            reply = stanza.reply()
-        else:
-            reply = stanza.reply()
-            reply.enable('error')
-            reply['error']['type'] = 'auth'
-            reply['error']['code'] = '401'
-            reply['error']['condition'] = 'not-authorized'
-        reply.append(stanza['confirm'])
-        reply.send()
-
-if __name__ == '__main__':
-    # Setup the command line arguments.
-    parser = ArgumentParser()
-    parser.add_argument("-q","--quiet", help="set logging to ERROR",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.ERROR,
-                        default=logging.INFO)
-    parser.add_argument("-d","--debug", help="set logging to DEBUG",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.DEBUG,
-                        default=logging.INFO)
-
-    # JID and password options.
-    parser.add_argument("-j", "--jid", dest="jid",
-                        help="JID to use")
-    parser.add_argument("-p", "--password", dest="password",
-                        help="password to use")
-
-    # Other options.
-    parser.add_argument("-t", "--trusted", nargs='*',
-                        help="List of trusted JIDs")
-
-    args = parser.parse_args()
-
-    # Setup logging.
-    logging.basicConfig(level=args.loglevel,
-                        format='%(levelname)-8s %(message)s')
-
-    if args.jid is None:
-        args.jid = input("Username: ")
-    if args.password is None:
-        args.password = getpass("Password: ")
-
-    xmpp = AnswerConfirm(args.jid, args.password, args.trusted)
-    xmpp.register_plugin('xep_0070')
-
-    # Connect to the XMPP server and start processing XMPP stanzas.
-    xmpp.connect()
-    xmpp.process()
--- a/examples/confirm_ask.py
+++ b/examples/confirm_ask.py
@@ -1,125 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-    Slixmpp: The Slick XMPP Library
-    Copyright (C) 2015 Emmanuel Gil Peyrot
-    This file is part of Slixmpp.
-
-    See the file LICENSE for copying permission.
-"""
-
-import sys
-
-import logging
-from getpass import getpass
-from argparse import ArgumentParser
-
-import slixmpp
-from slixmpp.exceptions import XMPPError, IqError
-from slixmpp import asyncio
-
-log = logging.getLogger(__name__)
-
-
-class AskConfirm(slixmpp.ClientXMPP):
-
-    """
-    A basic client asking an entity if they confirm the access to an HTTP URL.
-    """
-
-    def __init__(self, jid, password, recipient, id, url, method):
-        slixmpp.ClientXMPP.__init__(self, jid, password)
-
-        self.recipient = recipient
-        self.id = id
-        self.url = url
-        self.method = method
-
-        # Will be used to set the proper exit code.
-        self.confirmed = asyncio.Future()
-
-        self.add_event_handler("session_start", self.start)
-        self.add_event_handler("message", self.start)
-        self.add_event_handler("http_confirm_message", self.confirm)
-
-    def confirm(self, message):
-        print(message)
-        if message['confirm']['id'] == self.id:
-            if message['type'] == 'error':
-                self.confirmed.set_result(False)
-            else:
-                self.confirmed.set_result(True)
-
-    @asyncio.coroutine
-    def start(self, event):
-        log.info('Sending confirm request %s to %s who wants to access %s using '
-                 'method %s...' % (self.id, self.recipient, self.url, self.method))
-        try:
-            confirmed = yield from self['xep_0070'].ask_confirm(self.recipient,
-                                                                id=self.id,
-                                                                url=self.url,
-                                                                method=self.method,
-                                                                message='Plz say yes or no for {method} {url} ({id}).')
-            if isinstance(confirmed, slixmpp.Message):
-                confirmed = yield from self.confirmed
-            else:
-                confirmed = True
-        except IqError:
-            confirmed = False
-        if confirmed:
-            print('Confirmed')
-        else:
-            print('Denied')
-        self.disconnect()
-
-
-if __name__ == '__main__':
-    # Setup the command line arguments.
-    parser = ArgumentParser()
-    parser.add_argument("-q","--quiet", help="set logging to ERROR",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.ERROR,
-                        default=logging.INFO)
-    parser.add_argument("-d","--debug", help="set logging to DEBUG",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.DEBUG,
-                        default=logging.INFO)
-
-    # JID and password options.
-    parser.add_argument("-j", "--jid", dest="jid",
-                        help="JID to use")
-    parser.add_argument("-p", "--password", dest="password",
-                        help="password to use")
-
-    # Other options.
-    parser.add_argument("-r", "--recipient", required=True,
-                        help="Recipient JID")
-    parser.add_argument("-i", "--id", required=True,
-                        help="id TODO")
-    parser.add_argument("-u", "--url", required=True,
-                        help="URL the user tried to access")
-    parser.add_argument("-m", "--method", required=True,
-                        help="HTTP method used")
-
-    args = parser.parse_args()
-
-    # Setup logging.
-    logging.basicConfig(level=args.loglevel,
-                        format='%(levelname)-8s %(message)s')
-
-    if args.jid is None:
-        args.jid = input("Username: ")
-    if args.password is None:
-        args.password = getpass("Password: ")
-
-    xmpp = AskConfirm(args.jid, args.password, args.recipient, args.id,
-                      args.url, args.method)
-    xmpp.register_plugin('xep_0070')
-
-    # Connect to the XMPP server and start processing XMPP stanzas.
-    xmpp.connect()
-    xmpp.process(forever=False)
-    sys.exit(0 if xmpp.confirmed else 1)
--- a/examples/custom_stanzas/custom_stanza_provider.py
+++ b/examples/custom_stanzas/custom_stanza_provider.py
@@ -50,7 +50,7 @@ class ActionBot(slixmpp.ClientXMPP):

        register_stanza_plugin(Iq, Action)

-    async def start(self, event):
+    def start(self, event):
        """
        Process the session_start event.

@@ -73,7 +73,7 @@ class ActionBot(slixmpp.ClientXMPP):
        """
        self.event('custom_action', iq)

-    async def _handle_action_event(self, iq):
+    def _handle_action_event(self, iq):
        """
        Respond to the custom action event.
        """
@@ -82,20 +82,17 @@ class ActionBot(slixmpp.ClientXMPP):

        if method == 'is_prime' and param == '2':
            print("got message: %s" % iq)
-            rep = iq.reply()
-            rep['action']['status'] = 'done'
-            await rep.send()
+            iq.reply()
+            iq['action']['status'] = 'done'
+            iq.send()
        elif method == 'bye':
            print("got message: %s" % iq)
-            rep = iq.reply()
-            rep['action']['status'] = 'done'
-            await rep.send()
            self.disconnect()
        else:
            print("got message: %s" % iq)
-            rep = iq.reply()
-            rep['action']['status'] = 'error'
-            await rep.send()
+            iq.reply()
+            iq['action']['status'] = 'error'
+            iq.send()

 if __name__ == '__main__':
    # Setup the command line arguments.
--- a/examples/custom_stanzas/custom_stanza_user.py
+++ b/examples/custom_stanzas/custom_stanza_user.py
@@ -43,7 +43,7 @@ class ActionUserBot(slixmpp.ClientXMPP):

        register_stanza_plugin(Iq, Action)

-    async def start(self, event):
+    def start(self, event):
        """
        Process the session_start event.

@@ -57,11 +57,11 @@ class ActionUserBot(slixmpp.ClientXMPP):
                     data.
        """
        self.send_presence()
-        await self.get_roster()
+        self.get_roster()

-        await self.send_custom_iq()
+        self.send_custom_iq()

-    async def send_custom_iq(self):
+    def send_custom_iq(self):
        """Create and send two custom actions.

        If the first action was successful, then send
@@ -74,14 +74,14 @@ class ActionUserBot(slixmpp.ClientXMPP):
        iq['action']['param'] = '2'

        try:
-            resp = await iq.send()
+            resp = iq.send()
            if resp['action']['status'] == 'done':
                #sending bye
                iq2 = self.Iq()
                iq2['to'] = self.action_provider
                iq2['type'] = 'set'
                iq2['action']['method'] = 'bye'
-                await iq2.send()
+                iq2.send(block=False)

                self.disconnect()
        except XMPPError:
--- a/examples/custom_stanzas/stanza.py
+++ b/examples/custom_stanzas/stanza.py
@@ -41,7 +41,7 @@ class Action(ElementBase):
    #:     del action['status']
    #:
    #: to set, get, or remove its values.
-    interfaces = {'method', 'param', 'status'}
+    interfaces = set(('method', 'param', 'status'))

    #: By default, values in the `interfaces` set are mapped to
    #: attribute values. This can be changed such that an interface
--- a/examples/gtalk_custom_domain.py
+++ b/examples/gtalk_custom_domain.py
@@ -55,8 +55,8 @@ class GTalkBot(slixmpp.ClientXMPP):
            cert.verify('talk.google.com', der_cert)
            logging.debug("CERT: Found GTalk certificate")
        except cert.CertificateError as err:
-            logging.error(err.message)
-            self.disconnect()
+            log.error(err.message)
+            self.disconnect(send_close=False)

    def start(self, event):
        """
--- a/examples/http_over_xmpp.py
+++ b/examples/http_over_xmpp.py
@@ -13,7 +13,7 @@

 from slixmpp import ClientXMPP

-from argparse import ArgumentParser
+from optparse import OptionParser
 import logging
 import getpass

@@ -23,7 +23,7 @@ class HTTPOverXMPPClient(ClientXMPP):
        ClientXMPP.__init__(self, jid, password)
        self.register_plugin('xep_0332')    # HTTP over XMPP Transport
        self.add_event_handler(
-            'session_start', self.session_start
+            'session_start', self.session_start, threaded=True
        )
        self.add_event_handler('http_request', self.http_request_received)
        self.add_event_handler('http_response', self.http_response_received)
@@ -58,40 +58,40 @@ if __name__ == '__main__':
    # ./http_over_xmpp.py -J <jid> -P <pwd> -i <ip> -p <port> [-v]
    #

-    parser = ArgumentParser()
+    parser = OptionParser()

    # Output verbosity options.
-    parser.add_argument(
+    parser.add_option(
        '-v', '--verbose', help='set logging to DEBUG', action='store_const',
        dest='loglevel', const=logging.DEBUG, default=logging.ERROR
    )

    # JID and password options.
-    parser.add_argument('-J', '--jid', dest='jid', help='JID')
-    parser.add_argument('-P', '--password', dest='password', help='Password')
+    parser.add_option('-J', '--jid', dest='jid', help='JID')
+    parser.add_option('-P', '--password', dest='password', help='Password')

    # XMPP server ip and port options.
-    parser.add_argument(
+    parser.add_option(
        '-i', '--ipaddr', dest='ipaddr',
        help='IP Address of the XMPP server', default=None
    )
-    parser.add_argument(
+    parser.add_option(
        '-p', '--port', dest='port',
        help='Port of the XMPP server', default=None
    )

-    args = parser.parse_args()
+    opts, args = parser.parse_args()

    # Setup logging.
-    logging.basicConfig(level=args.loglevel,
+    logging.basicConfig(level=opts.loglevel,
                        format='%(levelname)-8s %(message)s')

-    if args.jid is None:
-        args.jid = input('Username: ')
-    if args.password is None:
-        args.password = getpass.getpass('Password: ')
+    if opts.jid is None:
+        opts.jid = input('Username: ')
+    if opts.password is None:
+        opts.password = getpass.getpass('Password: ')

-    xmpp = HTTPOverXMPPClient(args.jid, args.password)
+    xmpp = HTTPOverXMPPClient(opts.jid, opts.password)
    xmpp.connect()
    xmpp.process()

--- a/examples/http_upload.py
+++ b/examples/http_upload.py
@@ -1,92 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-    Slixmpp: The Slick XMPP Library
-    Copyright (C) 2018 Emmanuel Gil Peyrot
-    This file is part of Slixmpp.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-from getpass import getpass
-from argparse import ArgumentParser
-
-import slixmpp
-from slixmpp import asyncio
-
-log = logging.getLogger(__name__)
-
-
-class HttpUpload(slixmpp.ClientXMPP):
-
-    """
-    A basic client asking an entity if they confirm the access to an HTTP URL.
-    """
-
-    def __init__(self, jid, password, recipient, filename):
-        slixmpp.ClientXMPP.__init__(self, jid, password)
-
-        self.recipient = recipient
-        self.filename = filename
-
-        self.add_event_handler("session_start", self.start)
-
-    @asyncio.coroutine
-    def start(self, event):
-        log.info('Uploading file %s...', self.filename)
-        url = yield from self['xep_0363'].upload_file(self.filename)
-        log.info('Upload success!')
-
-        log.info('Sending file to %s', self.recipient)
-        html = '<body xmlns="http://www.w3.org/1999/xhtml"><a href="%s">%s</a></body>' % (url, url)
-        self.send_message(self.recipient, url, mhtml=html)
-        self.disconnect()
-
-
-if __name__ == '__main__':
-    # Setup the command line arguments.
-    parser = ArgumentParser()
-    parser.add_argument("-q","--quiet", help="set logging to ERROR",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.ERROR,
-                        default=logging.INFO)
-    parser.add_argument("-d","--debug", help="set logging to DEBUG",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.DEBUG,
-                        default=logging.INFO)
-
-    # JID and password options.
-    parser.add_argument("-j", "--jid", dest="jid",
-                        help="JID to use")
-    parser.add_argument("-p", "--password", dest="password",
-                        help="password to use")
-
-    # Other options.
-    parser.add_argument("-r", "--recipient", required=True,
-                        help="Recipient JID")
-    parser.add_argument("-f", "--file", required=True,
-                        help="File to send")
-
-    args = parser.parse_args()
-
-    # Setup logging.
-    logging.basicConfig(level=args.loglevel,
-                        format='%(levelname)-8s %(message)s')
-
-    if args.jid is None:
-        args.jid = input("Username: ")
-    if args.password is None:
-        args.password = getpass("Password: ")
-
-    xmpp = HttpUpload(args.jid, args.password, args.recipient, args.file)
-    xmpp.register_plugin('xep_0071')
-    xmpp.register_plugin('xep_0128')
-    xmpp.register_plugin('xep_0363')
-
-    # Connect to the XMPP server and start processing XMPP stanzas.
-    xmpp.connect()
-    xmpp.process(forever=False)
--- a/examples/mam.py
+++ b/examples/mam.py
@@ -1,98 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-    Slixmpp: The Slick XMPP Library
-    Copyright (C) 2017 Mathieu Pasquet
-    This file is part of Slixmpp.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-from getpass import getpass
-from argparse import ArgumentParser
-
-import slixmpp
-from slixmpp.exceptions import XMPPError
-from slixmpp import asyncio
-
-log = logging.getLogger(__name__)
-
-
-class MAM(slixmpp.ClientXMPP):
-
-    """
-    A basic client fetching mam archive messages
-    """
-
-    def __init__(self, jid, password, remote_jid, start):
-        slixmpp.ClientXMPP.__init__(self, jid, password)
-        self.remote_jid = remote_jid
-        self.start_date = start
-
-        self.add_event_handler("session_start", self.start)
-
-    async def start(self, *args):
-        """
-        Fetch mam results for the specified JID.
-        Use RSM to paginate the results.
-        """
-        results = self.plugin['xep_0313'].retrieve(jid=self.remote_jid, iterator=True, rsm={'max': 10}, start=self.start_date)
-        page = 1
-        async for rsm in results:
-            print('Page %d' % page)
-            for msg in rsm['mam']['results']:
-                forwarded = msg['mam_result']['forwarded']
-                timestamp = forwarded['delay']['stamp']
-                message = forwarded['stanza']
-                print('[%s] %s: %s' % (timestamp, message['from'], message['body']))
-            page += 1
-        self.disconnect()
-
-if __name__ == '__main__':
-    # Setup the command line arguments.
-    parser = ArgumentParser()
-    parser.add_argument("-q","--quiet", help="set logging to ERROR",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.ERROR,
-                        default=logging.INFO)
-    parser.add_argument("-d","--debug", help="set logging to DEBUG",
-                        action="store_const",
-                        dest="loglevel",
-                        const=logging.DEBUG,
-                        default=logging.INFO)
-
-    # JID and password options.
-    parser.add_argument("-j", "--jid", dest="jid",
-                        help="JID to use")
-    parser.add_argument("-p", "--password", dest="password",
-                        help="password to use")
-
-    # Other options
-    parser.add_argument("-r", "--remote-jid", dest="remote_jid",
-                        help="Remote JID")
-    parser.add_argument("--start", help="Start date", default='2017-09-20T12:00:00Z')
-
-    args = parser.parse_args()
-
-    # Setup logging.
-    logging.basicConfig(level=args.loglevel,
-                        format='%(levelname)-8s %(message)s')
-
-    if args.jid is None:
-        args.jid = input("Username: ")
-    if args.password is None:
-        args.password = getpass("Password: ")
-    if args.remote_jid is None:
-        args.remote_jid = input("Remote JID: ")
-    if args.start is None:
-        args.start = input("Start time: ")
-
-    xmpp = MAM(args.jid, args.password, args.remote_jid, args.start)
-    xmpp.register_plugin('xep_0313')
-
-    # Connect to the XMPP server and start processing XMPP stanzas.
-    xmpp.connect()
-    xmpp.process(forever=False)
--- a/examples/markup.py
+++ b/examples/markup.py
@@ -1,120 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-    Slixmpp: The Slick XMPP Library
-    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of Slixmpp.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-from getpass import getpass
-from argparse import ArgumentParser
-
-import slixmpp
-from slixmpp.plugins.xep_0394 import stanza as markup_stanza
-
-
-class EchoBot(slixmpp.ClientXMPP):
-
-    """
-    A simple Slixmpp bot that will echo messages it
-    receives, along with a short thank you message.
-    """
-
-    def __init__(self, jid, password):
-        slixmpp.ClientXMPP.__init__(self, jid, password)
-
-        # The session_start event will be triggered when
-        # the bot establishes its connection with the server
-        # and the XML streams are ready for use. We want to
-        # listen for this event so that we we can initialize
-        # our roster.
-        self.add_event_handler("session_start", self.start)
-
-        # The message event is triggered whenever a message
-        # stanza is received. Be aware that that includes
-        # MUC messages and error messages.
-        self.add_event_handler("message", self.message)
-
-    def start(self, event):
-        """
-        Process the session_start event.
-
-        Typical actions for the session_start event are
-        requesting the roster and broadcasting an initial
-        presence stanza.
-
-        Arguments:
-            event -- An empty dictionary. The session_start
-                     event does not provide any additional
-                     data.
-        """
-        self.send_presence()
-        self.get_roster()
-
-    def message(self, msg):
-        """
-        Process incoming message stanzas. Be aware that this also
-        includes MUC messages and error messages. It is usually
-        a good idea to check the messages's type before processing
-        or sending replies.
-
-        Arguments:
-            msg -- The received message stanza. See the documentation
-                   for stanza objects and the Message stanza to see
-                   how it may be used.
-        """
-        body = msg['body']
-        new_body = self['xep_0394'].to_plain_text(body, msg['markup'])
-        xhtml = self['xep_0394'].to_xhtml_im(body, msg['markup'])
-        print('Plain text:', new_body)
-        print('XHTML-IM:', xhtml['body'])
-        message = msg.reply()
-        message['body'] = new_body
-        message['html']['body'] = xhtml['body']
-        self.send(message)
-
-
-if __name__ == '__main__':
-    # Setup the command line arguments.
-    parser = ArgumentParser(description=EchoBot.__doc__)
-
-    # Output verbosity options.
-    parser.add_argument("-q", "--quiet", help="set logging to ERROR",
-                        action="store_const", dest="loglevel",
-                        const=logging.ERROR, default=logging.INFO)
-    parser.add_argument("-d", "--debug", help="set logging to DEBUG",
-                        action="store_const", dest="loglevel",
-                        const=logging.DEBUG, default=logging.INFO)
-
-    # JID and password options.
-    parser.add_argument("-j", "--jid", dest="jid",
-                        help="JID to use")
-    parser.add_argument("-p", "--password", dest="password",
-                        help="password to use")
-
-    args = parser.parse_args()
-
-    # Setup logging.
-    logging.basicConfig(level=args.loglevel,
-                        format='%(levelname)-8s %(message)s')
-
-    if args.jid is None:
-        args.jid = input("Username: ")
-    if args.password is None:
-        args.password = getpass("Password: ")
-
-    # Setup the EchoBot and register plugins. Note that while plugins may
-    # have interdependencies, the order in which you register them does
-    # not matter.
-    xmpp = EchoBot(args.jid, args.password)
-    xmpp.register_plugin('xep_0030') # Service Discovery
-    xmpp.register_plugin('xep_0199') # XMPP Ping
-    xmpp.register_plugin('xep_0394') # Message Markup
-
-    # Connect to the XMPP server and start processing XMPP stanzas.
-    xmpp.connect()
-    xmpp.process()
--- a/examples/muc.py
+++ b/examples/muc.py
@@ -67,11 +67,11 @@ class MUCBot(slixmpp.ClientXMPP):
        """
        self.get_roster()
        self.send_presence()
-        self.plugin['xep_0045'].join_muc(self.room,
-                                         self.nick,
-                                         # If a room password is needed, use:
-                                         # password=the_room_password,
-                                         wait=True)
+        self.plugin['xep_0045'].joinMUC(self.room,
+                                        self.nick,
+                                        # If a room password is needed, use:
+                                        # password=the_room_password,
+                                        wait=True)

    def muc_message(self, msg):
        """
--- a/examples/pubsub_client.py
+++ b/examples/pubsub_client.py
@@ -15,13 +15,13 @@ class PubsubClient(slixmpp.ClientXMPP):

    def __init__(self, jid, password, server,
                       node=None, action='nodes', data=''):
-        super().__init__(jid, password)
+        super(PubsubClient, self).__init__(jid, password)

        self.register_plugin('xep_0030')
        self.register_plugin('xep_0059')
        self.register_plugin('xep_0060')

-        self.actions = ['nodes', 'create', 'delete', 'get_configure',
+        self.actions = ['nodes', 'create', 'delete',
                        'publish', 'get', 'retract',
                        'purge', 'subscribe', 'unsubscribe']

@@ -40,7 +40,7 @@ class PubsubClient(slixmpp.ClientXMPP):
        try:
            yield from getattr(self, self.action)()
        except:
-            logging.exception('Could not execute %s:', self.action)
+            logging.error('Could not execute: %s', self.action)
        self.disconnect()

    def nodes(self):
@@ -65,13 +65,6 @@ class PubsubClient(slixmpp.ClientXMPP):
        except XMPPError as error:
            logging.error('Could not delete node %s: %s', self.node, error.format())

-    def get_configure(self):
-        try:
-            configuration_form = yield from self['xep_0060'].get_node_config(self.pubsub_server, self.node)
-            logging.info('Configure form received from node %s: %s', self.node, configuration_form['pubsub_owner']['configure']['form'])
-        except XMPPError as error:
-            logging.error('Could not retrieve configure form from node %s: %s', self.node, error.format())
-
    def publish(self):
        payload = ET.fromstring("<test xmlns='test'>%s</test>" % self.data)
        try:
@@ -125,7 +118,7 @@ if __name__ == '__main__':
    parser = ArgumentParser()
    parser.version = '%%prog 0.1'
    parser.usage = "Usage: %%prog [options] <jid> " + \
-                             'nodes|create|delete|get_configure|purge|subscribe|unsubscribe|publish|retract|get' + \
+                             'nodes|create|delete|purge|subscribe|unsubscribe|publish|retract|get' + \
                             ' [<node> <data>]'

    parser.add_argument("-q","--quiet", help="set logging to ERROR",
@@ -146,7 +139,7 @@ if __name__ == '__main__':
                        help="password to use")

    parser.add_argument("server")
-    parser.add_argument("action", choices=["nodes", "create", "delete", "get_configure", "purge", "subscribe", "unsubscribe", "publish", "retract", "get"])
+    parser.add_argument("action", choices=["nodes", "create", "delete", "purge", "subscribe", "unsubscribe", "publish", "retract", "get"])
    parser.add_argument("node", nargs='?')
    parser.add_argument("data", nargs='?')

--- a/examples/pubsub_events.py
+++ b/examples/pubsub_events.py
@@ -14,7 +14,7 @@ from slixmpp.xmlstream.handler import Callback
 class PubsubEvents(slixmpp.ClientXMPP):

    def __init__(self, jid, password):
-        super().__init__(jid, password)
+        super(PubsubEvents, self).__init__(jid, password)

        self.register_plugin('xep_0030')
        self.register_plugin('xep_0059')
--- a/examples/user_location.py
+++ b/examples/user_location.py
@@ -22,7 +22,7 @@ from slixmpp import ClientXMPP
 class LocationBot(ClientXMPP):

    def __init__(self, jid, password):
-        super().__init__(jid, password)
+        super(LocationBot, self).__init__(jid, password)

        self.add_event_handler('session_start', self.start)
        self.add_event_handler('user_location_publish',
--- a/examples/user_tune.py
+++ b/examples/user_tune.py
@@ -17,7 +17,7 @@ from slixmpp import ClientXMPP
 class TuneBot(ClientXMPP):

    def __init__(self, jid, password):
-        super().__init__(jid, password)
+        super(TuneBot, self).__init__(jid, password)

        # Check for the current song every 5 seconds.
        self.schedule('Check Current Tune', 5, self._update_tune, repeat=True)
--- a/setup.py
+++ b/setup.py
@@ -7,15 +7,20 @@
 # 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__

@@ -29,49 +34,12 @@ CLASSIFIERS = [
    'Intended Audience :: Developers',
    'License :: OSI Approved :: MIT License',
    'Programming Language :: Python',
-    'Programming Language :: Python :: 3.5',
-    'Programming Language :: Python :: 3.6',
-    'Programming Language :: Python :: 3.7',
-    'Topic :: Internet :: XMPP',
+    'Programming Language :: Python :: 3.4',
    'Topic :: Software Development :: Libraries :: Python Modules',
 ]

 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,
--- a/slixmpp/init.py
+++ b/slixmpp/init.py
@@ -6,13 +6,11 @@
    See the file LICENSE for copying permission.
 """

+import asyncio
+asyncio.sslproto._is_sslproto_available=lambda: False
 import logging
 logging.getLogger(__name__).addHandler(logging.NullHandler())

-import asyncio
-# Required for python < 3.7 to use the old ssl implementation
-# and manage to do starttls as an unintended side effect
-asyncio.sslproto._is_sslproto_available = lambda: False

 from slixmpp.stanza import Message, Presence, Iq
 from slixmpp.jid import JID, InvalidJID
--- a/slixmpp/basexmpp.py
+++ b/slixmpp/basexmpp.py
@@ -12,8 +12,8 @@
    :license: MIT, see LICENSE for more details
 """

-import asyncio
 import logging
+import threading

 from slixmpp import plugins, roster, stanza
 from slixmpp.api import APIRegistry
@@ -21,6 +21,7 @@ from slixmpp.exceptions import IqError, IqTimeout

 from slixmpp.stanza import Message, Presence, Iq, StreamError
 from slixmpp.stanza.roster import Roster
+from slixmpp.stanza.nick import Nick

 from slixmpp.xmlstream import XMLStream, JID
 from slixmpp.xmlstream import ET, register_stanza_plugin
@@ -69,7 +70,7 @@ class BaseXMPP(XMLStream):
        #: redirections that will be followed before quitting.
        self.max_redirects = 5

-        self.session_bind_event = asyncio.Event()
+        self.session_bind_event = threading.Event()

        #: A dictionary mapping plugin names to plugins.
        self.plugin = PluginManager(self)
@@ -193,6 +194,7 @@ class BaseXMPP(XMLStream):

        # Initialize a few default stanza plugins.
        register_stanza_plugin(Iq, Roster)
+        register_stanza_plugin(Message, Nick)

    def start_stream_handler(self, xml):
        """Save the stream ID once the streams have been established.
@@ -685,6 +687,7 @@ class BaseXMPP(XMLStream):
            self.address = (host, port)
            self.default_domain = host
            self.dns_records = None
+            self.reconnect_delay = None
            self.reconnect()

    def _handle_message(self, msg):
@@ -750,9 +753,6 @@ class BaseXMPP(XMLStream):

        Update the roster with presence information.
        """
-        if self.roster[presence['from']].ignore_updates:
-            return
-
        if not self.is_component and not presence['to'].bare:
            presence['to'] = self.boundjid

--- a/slixmpp/clientxmpp.py
+++ b/slixmpp/clientxmpp.py
@@ -12,16 +12,14 @@
    :license: MIT, see LICENSE for more details
 """

-import asyncio
 import logging

-from slixmpp.jid import JID
 from slixmpp.stanza import StreamFeatures
 from slixmpp.basexmpp import BaseXMPP
 from slixmpp.exceptions import XMPPError
 from slixmpp.xmlstream import XMLStream
 from slixmpp.xmlstream.matcher import StanzaPath, MatchXPath
-from slixmpp.xmlstream.handler import Callback, CoroutineCallback
+from slixmpp.xmlstream.handler import Callback

 # Flag indicating if DNS SRV records are available for use.
 try:
@@ -106,24 +104,13 @@ class ClientXMPP(BaseXMPP):
        self.register_stanza(StreamFeatures)

        self.register_handler(
-                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)
+                Callback('Stream Features',
+                         MatchXPath('{%s}features' % self.stream_ns),
+                         self._handle_stream_features))
        self.register_handler(
                Callback('Roster Update',
                         StanzaPath('iq@type=set/roster'),
-                         roster_push_filter))
+                         lambda iq: self.event('roster_update', iq)))

        # Setup default stream features
        self.register_plugin('feature_starttls')
@@ -153,11 +140,8 @@ class ClientXMPP(BaseXMPP):
        will be used.

        :param address: A tuple containing the server's host and port.
-        :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_tls: Indicates if TLS should be used for the
+                        connection. Defaults to ``True``.
        :param use_ssl: Indicates if the older SSL connection method
                        should be used. Defaults to ``False``.
        """
@@ -255,7 +239,7 @@ class ClientXMPP(BaseXMPP):
                orig_cb(resp)
            callback = wrapped

-        return iq.send(callback, timeout, timeout_callback)
+        iq.send(callback, timeout, timeout_callback)

    def _reset_connection_state(self, event=None):
        #TODO: Use stream state here
@@ -265,7 +249,7 @@ class ClientXMPP(BaseXMPP):
        self.bindfail = False
        self.features = set()

-    async def _handle_stream_features(self, features):
+    def _handle_stream_features(self, features):
        """Process the received stream features.

        :param features: The features stanza.
@@ -273,11 +257,7 @@ class ClientXMPP(BaseXMPP):
        for order, name in self._stream_feature_order:
            if name in features['features']:
                handler, restart = self._stream_feature_handlers[name]
-                if asyncio.iscoroutinefunction(handler):
-                    result = await handler(features)
-                else:
-                    result = handler(features)
-                if result and restart:
+                if handler(features) and restart:
                    # Don't continue if the feature requires
                    # restarting the XML stream.
                    return True
--- a/slixmpp/exceptions.py
+++ b/slixmpp/exceptions.py
@@ -77,7 +77,7 @@ class IqTimeout(XMPPError):
    """

    def __init__(self, iq):
-        super().__init__(
+        super(IqTimeout, self).__init__(
                condition='remote-server-timeout',
                etype='cancel')

@@ -94,7 +94,7 @@ class IqError(XMPPError):
    """

    def __init__(self, iq):
-        super().__init__(
+        super(IqError, self).__init__(
                condition=iq['error']['condition'],
                text=iq['error']['text'],
                etype=iq['error']['type'])
--- a/slixmpp/features/feature_bind/init.py
+++ b/slixmpp/features/feature_bind/init.py
@@ -13,3 +13,7 @@ from slixmpp.features.feature_bind.stanza import Bind


 register_plugin(FeatureBind)
+
+
+# Retain some backwards compatibility
+feature_bind = FeatureBind
--- a/slixmpp/features/feature_bind/bind.py
+++ b/slixmpp/features/feature_bind/bind.py
@@ -6,7 +6,6 @@
    See the file LICENSE for copying permission.
 """

-import asyncio
 import logging

 from slixmpp.jid import JID
@@ -35,7 +34,7 @@ class FeatureBind(BasePlugin):
        register_stanza_plugin(Iq, stanza.Bind)
        register_stanza_plugin(StreamFeatures, stanza.Bind)

-    async def _handle_bind_resource(self, features):
+    def _handle_bind_resource(self, features):
        """
        Handle requesting a specific resource.

@@ -50,7 +49,7 @@ class FeatureBind(BasePlugin):
        if self.xmpp.requested_jid.resource:
            iq['bind']['resource'] = self.xmpp.requested_jid.resource

-        await iq.send(callback=self._on_bind_response)
+        iq.send(callback=self._on_bind_response)

    def _on_bind_response(self, response):
        self.xmpp.boundjid = JID(response['bind']['jid'])
--- a/slixmpp/features/feature_bind/stanza.py
+++ b/slixmpp/features/feature_bind/stanza.py
@@ -16,6 +16,6 @@ class Bind(ElementBase):

    name = 'bind'
    namespace = 'urn:ietf:params:xml:ns:xmpp-bind'
-    interfaces = {'resource', 'jid'}
+    interfaces = set(('resource', 'jid'))
    sub_interfaces = interfaces
    plugin_attrib = 'bind'
--- a/slixmpp/features/feature_mechanisms/init.py
+++ b/slixmpp/features/feature_mechanisms/init.py
@@ -16,3 +16,7 @@ from slixmpp.features.feature_mechanisms.stanza import Failure


 register_plugin(FeatureMechanisms)
+
+
+# Retain some backwards compatibility
+feature_mechanisms = FeatureMechanisms
--- a/slixmpp/features/feature_mechanisms/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/mechanisms.py
@@ -49,7 +49,7 @@ class FeatureMechanisms(BasePlugin):
        if self.security_callback is None:
            self.security_callback = self._default_security

-        creds = self.sasl_callback({'username'}, set())
+        creds = self.sasl_callback(set(['username']), set())
        if not self.use_mech and not creds['username']:
            self.use_mech = 'ANONYMOUS'

@@ -97,7 +97,13 @@ class FeatureMechanisms(BasePlugin):
                jid = self.xmpp.requested_jid.bare
                result[value] = creds.get('email', jid)
            elif value == 'channel_binding':
-                result[value] = self.xmpp.socket.get_channel_binding()
+                if hasattr(self.xmpp.socket, 'get_channel_binding'):
+                    result[value] = self.xmpp.socket.get_channel_binding()
+                else:
+                    log.debug("Channel binding not supported.")
+                    log.debug("Use Python 3.3+ for channel binding and " + \
+                              "SCRAM-SHA-1-PLUS support")
+                    result[value] = None
            elif value == 'host':
                result[value] = creds.get('host', self.xmpp.requested_jid.domain)
            elif value == 'realm':
@@ -116,7 +122,7 @@ class FeatureMechanisms(BasePlugin):
            if value == 'encrypted':
                if 'starttls' in self.xmpp.features:
                    result[value] = True
-                elif isinstance(self.xmpp.socket, (ssl.SSLSocket, ssl.SSLObject)):
+                elif isinstance(self.xmpp.socket, ssl.SSLSocket):
                    result[value] = True
                else:
                    result[value] = False
--- a/slixmpp/features/feature_mechanisms/stanza/auth.py
+++ b/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 = {'mechanism', 'value'}
+    interfaces = set(('mechanism', 'value'))
    plugin_attrib = name

    #: Some SASL mechs require sending values as is,
    #: without converting base64.
-    plain_mechs = {'X-MESSENGER-OAUTH2'}
+    plain_mechs = set(['X-MESSENGER-OAUTH2'])

    def setup(self, xml):
        StanzaBase.setup(self, xml)
--- a/slixmpp/features/feature_mechanisms/stanza/challenge.py
+++ b/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 = {'value'}
+    interfaces = set(('value',))
    plugin_attrib = name

    def setup(self, xml):
--- a/slixmpp/features/feature_mechanisms/stanza/failure.py
+++ b/slixmpp/features/feature_mechanisms/stanza/failure.py
@@ -16,14 +16,13 @@ class Failure(StanzaBase):

    name = 'failure'
    namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
-    interfaces = {'condition', 'text'}
+    interfaces = set(('condition', 'text'))
    plugin_attrib = name
-    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'}
+    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'))

    def setup(self, xml=None):
        """
--- a/slixmpp/features/feature_mechanisms/stanza/mechanisms.py
+++ b/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 = {'mechanisms', 'required'}
+    interfaces = set(('mechanisms', 'required'))
    plugin_attrib = name
    is_extension = True

@@ -29,7 +29,7 @@ class Mechanisms(ElementBase):
        """
        """
        results = []
-        mechs = self.xml.findall('{%s}mechanism' % self.namespace)
+        mechs = self.findall('{%s}mechanism' % self.namespace)
        if mechs:
            for mech in mechs:
                results.append(mech.text)
@@ -47,7 +47,7 @@ class Mechanisms(ElementBase):
    def del_mechanisms(self):
        """
        """
-        mechs = self.xml.findall('{%s}mechanism' % self.namespace)
+        mechs = self.findall('{%s}mechanism' % self.namespace)
        if mechs:
            for mech in mechs:
                self.xml.remove(mech)
--- a/slixmpp/features/feature_mechanisms/stanza/response.py
+++ b/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 = {'value'}
+    interfaces = set(('value',))
    plugin_attrib = name

    def setup(self, xml):
--- a/slixmpp/features/feature_mechanisms/stanza/success.py
+++ b/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 = {'value'}
+    interfaces = set(['value'])
    plugin_attrib = name

    def setup(self, xml):
--- a/slixmpp/features/feature_rosterver/init.py
+++ b/slixmpp/features/feature_rosterver/init.py
@@ -13,3 +13,7 @@ from slixmpp.features.feature_rosterver.stanza import RosterVer


 register_plugin(FeatureRosterVer)
+
+
+# Retain some backwards compatibility
+feature_rosterver = FeatureRosterVer
--- a/slixmpp/features/feature_session/init.py
+++ b/slixmpp/features/feature_session/init.py
@@ -13,3 +13,7 @@ from slixmpp.features.feature_session.stanza import Session


 register_plugin(FeatureSession)
+
+
+# Retain some backwards compatibility
+feature_session = FeatureSession
--- a/slixmpp/features/feature_session/session.py
+++ b/slixmpp/features/feature_session/session.py
@@ -6,7 +6,6 @@
    See the file LICENSE for copying permission.
 """

-import asyncio
 import logging

 from slixmpp.stanza import Iq, StreamFeatures
@@ -35,22 +34,17 @@ class FeatureSession(BasePlugin):
        register_stanza_plugin(Iq, stanza.Session)
        register_stanza_plugin(StreamFeatures, stanza.Session)

-    async def _handle_start_session(self, features):
+    def _handle_start_session(self, features):
        """
        Handle the start of the session.

        Arguments:
            feature -- The stream features element.
        """
-        if features['session']['optional']:
-            self.xmpp.sessionstarted = True
-            self.xmpp.event('session_start')
-            return
-
        iq = self.xmpp.Iq()
        iq['type'] = 'set'
        iq.enable('session')
-        await iq.send(callback=self._on_start_session_response)
+        iq.send(callback=self._on_start_session_response)

    def _on_start_session_response(self, response):
        self.xmpp.features.add('session')
--- a/slixmpp/features/feature_session/stanza.py
+++ b/slixmpp/features/feature_session/stanza.py
@@ -6,7 +6,7 @@
    See the file LICENSE for copying permission.
 """

-from slixmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase


 class Session(ElementBase):
@@ -16,19 +16,5 @@ class Session(ElementBase):

    name = 'session'
    namespace = 'urn:ietf:params:xml:ns:xmpp-session'
-    interfaces = {'optional'}
+    interfaces = set()
    plugin_attrib = 'session'
-
-    def get_optional(self):
-        return self.xml.find('{%s}optional' % self.namespace) is not None
-
-    def set_optional(self, value):
-        if value:
-            optional = ET.Element('{%s}optional' % self.namespace)
-            self.xml.append(optional)
-        else:
-            self.del_optional()
-
-    def del_optional(self):
-        optional = self.xml.find('{%s}optional' % self.namespace)
-        self.xml.remove(optional)
--- a/slixmpp/features/feature_starttls/init.py
+++ b/slixmpp/features/feature_starttls/init.py
@@ -13,3 +13,7 @@ from slixmpp.features.feature_starttls.stanza import *


 register_plugin(FeatureSTARTTLS)
+
+
+# Retain some backwards compatibility
+feature_starttls = FeatureSTARTTLS
--- a/slixmpp/features/feature_starttls/stanza.py
+++ b/slixmpp/features/feature_starttls/stanza.py
@@ -16,7 +16,7 @@ class STARTTLS(ElementBase):

    name = 'starttls'
    namespace = 'urn:ietf:params:xml:ns:xmpp-tls'
-    interfaces = {'required'}
+    interfaces = set(('required',))
    plugin_attrib = name

    def get_required(self):
--- a/slixmpp/features/feature_starttls/starttls.py
+++ b/slixmpp/features/feature_starttls/starttls.py
@@ -12,7 +12,7 @@ from slixmpp.stanza import StreamFeatures
 from slixmpp.xmlstream import register_stanza_plugin
 from slixmpp.plugins import BasePlugin
 from slixmpp.xmlstream.matcher import MatchXPath
-from slixmpp.xmlstream.handler import CoroutineCallback
+from slixmpp.xmlstream.handler import Callback
 from slixmpp.features.feature_starttls import stanza


@@ -28,7 +28,7 @@ class FeatureSTARTTLS(BasePlugin):

    def plugin_init(self):
        self.xmpp.register_handler(
-                CoroutineCallback('STARTTLS Proceed',
+                Callback('STARTTLS Proceed',
                        MatchXPath(stanza.Proceed.tag_name()),
                        self._handle_starttls_proceed,
                        instream=True))
@@ -58,8 +58,8 @@ class FeatureSTARTTLS(BasePlugin):
            self.xmpp.send(features['starttls'])
            return True

-    async def _handle_starttls_proceed(self, proceed):
+    def _handle_starttls_proceed(self, proceed):
        """Restart the XML stream when TLS is accepted."""
        log.debug("Starting TLS")
-        if await self.xmpp.start_tls():
+        if self.xmpp.start_tls():
            self.xmpp.features.add('starttls')
--- a/slixmpp/jid.py
+++ b/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 ''
+        return None

    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 ''
+        return None

    try:
        resource = resourceprep(resource)
@@ -208,15 +208,16 @@ def _format_jid(local=None, domain=None, resource=None):

    :return: A full or bare JID string.
    """
-    if domain is None:
-        return ''
+    result = []
    if local is not None:
-        result = local + '@' + domain
-    else:
-        result = domain
+        result.append(local)
+        result.append('@')
+    if domain is not None:
+        result.append(domain)
    if resource is not None:
-        result += '/' + resource
-    return result
+        result.append('/')
+        result.append(resource)
+    return ''.join(result)


 class InvalidJID(ValueError):
@@ -299,23 +300,19 @@ class JID:
    :raises InvalidJID:
    """

-    __slots__ = ('_node', '_domain', '_resource', '_bare', '_full')
+    __slots__ = ('_node', '_domain', '_resource')

    def __init__(self, jid=None):
        if not jid:
-            self._node = ''
-            self._domain = ''
-            self._resource = ''
-            self._bare = ''
-            self._full = ''
-            return
+            self._node = None
+            self._domain = None
+            self._resource = None
        elif not isinstance(jid, JID):
            self._node, self._domain, self._resource = _parse_jid(jid)
        else:
            self._node = jid._node
            self._domain = jid._domain
            self._resource = jid._resource
-        self._update_bare_full()

    def unescape(self):
        """Return an unescaped JID object.
@@ -332,94 +329,77 @@ class JID:
                            self._domain,
                            self._resource)

-    def _update_bare_full(self):
-        """Format the given JID into a bare and a full JID.
-        """
-        self._bare = (self._node + '@' + self._domain
-                      if self._node
-                      else self._domain)
-        self._full = (self._bare + '/' + self._resource
-                      if self._resource
-                      else self._bare)
-
    @property
    def node(self):
-        return self._node
+        return self._node or ''

    @property
    def user(self):
-        return self._node
+        return self._node or ''

    @property
    def local(self):
-        return self._node
+        return self._node or ''

    @property
    def username(self):
-        return self._node
+        return self._node or ''

    @property
    def domain(self):
-        return self._domain
+        return self._domain or ''

    @property
    def server(self):
-        return self._domain
+        return self._domain or ''

    @property
    def host(self):
-        return self._domain
+        return self._domain or ''

    @property
    def resource(self):
-        return self._resource
+        return self._resource or ''

    @property
    def bare(self):
-        return self._bare
+        return _format_jid(self._node, self._domain)

    @property
    def full(self):
-        return self._full
+        return _format_jid(self._node, self._domain, self._resource)

    @property
    def jid(self):
-        return self._full
+        return _format_jid(self._node, self._domain, self._resource)

    @node.setter
    def node(self, value):
        self._node = _validate_node(value)
-        self._update_bare_full()

    @user.setter
    def user(self, value):
        self._node = _validate_node(value)
-        self._update_bare_full()

    @local.setter
    def local(self, value):
        self._node = _validate_node(value)
-        self._update_bare_full()

    @username.setter
    def username(self, value):
        self._node = _validate_node(value)
-        self._update_bare_full()

    @domain.setter
    def domain(self, value):
        self._domain = _validate_domain(value)
-        self._update_bare_full()

    @server.setter
    def server(self, value):
        self._domain = _validate_domain(value)
-        self._update_bare_full()

    @host.setter
    def host(self, value):
        self._domain = _validate_domain(value)
-        self._update_bare_full()

    @bare.setter
    def bare(self, value):
@@ -427,30 +407,26 @@ class JID:
        assert not resource
        self._node = node
        self._domain = domain
-        self._update_bare_full()

    @resource.setter
    def resource(self, value):
        self._resource = _validate_resource(value)
-        self._update_bare_full()

    @full.setter
    def full(self, value):
        self._node, self._domain, self._resource = _parse_jid(value)
-        self._update_bare_full()

    @jid.setter
    def jid(self, value):
        self._node, self._domain, self._resource = _parse_jid(value)
-        self._update_bare_full()

    def __str__(self):
        """Use the full JID as the string value."""
-        return self._full
+        return _format_jid(self._node, self._domain, self._resource)

    def __repr__(self):
        """Use the full JID as the representation."""
-        return self._full
+        return _format_jid(self._node, self._domain, self._resource)

    # pylint: disable=W0212
    def __eq__(self, other):
@@ -470,4 +446,4 @@ class JID:

    def __hash__(self):
        """Hash a JID based on the string version of its full JID."""
-        return hash(self._full)
+        return hash(_format_jid(self._node, self._domain, self._resource))
--- a/slixmpp/plugins/base.py
+++ b/slixmpp/plugins/base.py
@@ -308,7 +308,7 @@ class BasePlugin(object):
        if key in self.default_config:
            self.config[key] = value
        else:
-            super().__setattr__(key, value)
+            super(BasePlugin, self).__setattr__(key, value)

    def _init(self):
        """Initialize plugin state, such as registering event handlers.
--- a/slixmpp/plugins/gmail_notify.py
+++ b/slixmpp/plugins/gmail_notify.py
@@ -21,15 +21,15 @@ class GmailQuery(ElementBase):
    namespace = 'google:mail:notify'
    name = 'query'
    plugin_attrib = 'gmail'
-    interfaces = {'newer-than-time', 'newer-than-tid', 'q', 'search'}
+    interfaces = set(('newer-than-time', 'newer-than-tid', 'q', 'search'))

-    def get_search(self):
+    def getSearch(self):
        return self['q']

-    def set_search(self, search):
+    def setSearch(self, search):
        self['q'] = search

-    def del_search(self):
+    def delSearch(self):
        del self['q']


@@ -37,20 +37,20 @@ class MailBox(ElementBase):
    namespace = 'google:mail:notify'
    name = 'mailbox'
    plugin_attrib = 'mailbox'
-    interfaces = {'result-time', 'total-matched', 'total-estimate',
-                  'url', 'threads', 'matched', 'estimate'}
+    interfaces = set(('result-time', 'total-matched', 'total-estimate',
+                      'url', 'threads', 'matched', 'estimate'))

-    def get_threads(self):
+    def getThreads(self):
        threads = []
        for threadXML in self.xml.findall('{%s}%s' % (MailThread.namespace,
                                                      MailThread.name)):
            threads.append(MailThread(xml=threadXML, parent=None))
        return threads

-    def get_matched(self):
+    def getMatched(self):
        return self['total-matched']

-    def get_estimate(self):
+    def getEstimate(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 = {'tid', 'participation', 'messages', 'date',
-                  'senders', 'url', 'labels', 'subject', 'snippet'}
-    sub_interfaces = {'labels', 'subject', 'snippet'}
+    interfaces = set(('tid', 'participation', 'messages', 'date',
+                      'senders', 'url', 'labels', 'subject', 'snippet'))
+    sub_interfaces = set(('labels', 'subject', 'snippet'))

-    def get_senders(self):
+    def getSenders(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 = {'address', 'name', 'originator', 'unread'}
+    interfaces = set(('address', 'name', 'originator', 'unread'))

-    def get_originator(self):
+    def getOriginator(self):
        return self.xml.attrib.get('originator', '0') == '1'

-    def get_unread(self):
+    def getUnread(self):
        return self.xml.attrib.get('unread', '0') == '1'


--- a/slixmpp/plugins/google/init.py
+++ b/slixmpp/plugins/google/init.py
@@ -1,47 +0,0 @@
-"""
-    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)
--- a/slixmpp/plugins/google/auth/init.py
+++ b/slixmpp/plugins/google/auth/init.py
@@ -1,10 +0,0 @@
-"""
-    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
--- a/slixmpp/plugins/google/auth/auth.py
+++ b/slixmpp/plugins/google/auth/auth.py
@@ -1,47 +0,0 @@
-"""
-    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
--- a/slixmpp/plugins/google/auth/stanza.py
+++ b/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 = {'client_uses_full_bind_result', 'service'}
+    interfaces = set(['client_uses_full_bind_result', 'service'])

    discovery_attr= '{%s}client-uses-full-bind-result' % namespace
    service_attr= '{%s}service' % namespace
--- a/slixmpp/plugins/google/gmail/init.py
+++ b/slixmpp/plugins/google/gmail/init.py
@@ -1,10 +0,0 @@
-"""
-    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
--- a/slixmpp/plugins/google/gmail/stanza.py
+++ b/slixmpp/plugins/google/gmail/stanza.py
@@ -1,101 +0,0 @@
-"""
-    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)
--- a/slixmpp/plugins/google/nosave/init.py
+++ b/slixmpp/plugins/google/nosave/init.py
@@ -1,10 +0,0 @@
-"""
-    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
--- a/slixmpp/plugins/google/nosave/nosave.py
+++ b/slixmpp/plugins/google/nosave/nosave.py
@@ -1,78 +0,0 @@
-"""
-    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)
--- a/slixmpp/plugins/google/nosave/stanza.py
+++ b/slixmpp/plugins/google/nosave/stanza.py
@@ -14,7 +14,7 @@ class NoSave(ElementBase):
    name = 'x'
    namespace = 'google:nosave'
    plugin_attrib = 'google_nosave'
-    interfaces = {'value'}
+    interfaces = set(['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 = {'jid', 'source', 'value'}
+    interfaces = set(['jid', 'source', 'value'])

    def get_value(self):
        return self._get_attr('value', '') == 'enabled'
--- a/slixmpp/plugins/google/settings/init.py
+++ b/slixmpp/plugins/google/settings/init.py
@@ -1,10 +0,0 @@
-"""
-    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
--- a/slixmpp/plugins/google/settings/stanza.py
+++ b/slixmpp/plugins/google/settings/stanza.py
@@ -1,110 +0,0 @@
-"""
-    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')
--- a/slixmpp/plugins/xep_0004/init.py
+++ b/slixmpp/plugins/xep_0004/init.py
@@ -14,3 +14,9 @@ from slixmpp.plugins.xep_0004.dataforms import XEP_0004


 register_plugin(XEP_0004)
+
+
+# Retain some backwards compatibility
+xep_0004 = XEP_0004
+xep_0004.makeForm = xep_0004.make_form
+xep_0004.buildForm = xep_0004.build_form
--- a/slixmpp/plugins/xep_0004/dataforms.py
+++ b/slixmpp/plugins/xep_0004/dataforms.py
@@ -23,7 +23,7 @@ class XEP_0004(BasePlugin):

    name = 'xep_0004'
    description = 'XEP-0004: Data Forms'
-    dependencies = {'xep_0030'}
+    dependencies = set(['xep_0030'])
    stanza = stanza

    def plugin_init(self):
--- a/slixmpp/plugins/xep_0004/stanza/field.py
+++ b/slixmpp/plugins/xep_0004/stanza/field.py
@@ -14,21 +14,21 @@ class FormField(ElementBase):
    name = 'field'
    plugin_attrib = 'field'
    plugin_multi_attrib = 'fields'
-    interfaces = {'answer', 'desc', 'required', 'value',
-                  'label', 'type', 'var'}
-    sub_interfaces = {'desc'}
+    interfaces = set(('answer', 'desc', 'required', 'value',
+                      'label', 'type', 'var'))
+    sub_interfaces = set(('desc',))
    plugin_tag_map = {}
    plugin_attrib_map = {}

-    field_types = {'boolean', 'fixed', 'hidden', 'jid-multi',
-                   'jid-single', 'list-multi', 'list-single',
-                   'text-multi', 'text-private', 'text-single'}
+    field_types = set(('boolean', 'fixed', 'hidden', 'jid-multi',
+                       'jid-single', 'list-multi', 'list-single',
+                       'text-multi', 'text-private', 'text-single'))

-    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'}
+    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'))

    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 = {'label', 'value'}
-    sub_interfaces = {'value'}
+    interfaces = set(('label', 'value'))
+    sub_interfaces = set(('value',))
    plugin_multi_attrib = 'options'


--- a/slixmpp/plugins/xep_0004/stanza/form.py
+++ b/slixmpp/plugins/xep_0004/stanza/form.py
@@ -23,9 +23,9 @@ class Form(ElementBase):
    namespace = 'jabber:x:data'
    name = 'x'
    plugin_attrib = 'form'
-    interfaces = OrderedSet(('instructions', 'reported', 'title', 'type', 'items', 'values'))
-    sub_interfaces = {'title'}
-    form_types = {'cancel', 'form', 'result', 'submit'}
+    interfaces = OrderedSet(('instructions', 'reported', 'title', 'type', 'items', ))
+    sub_interfaces = set(('title',))
+    form_types = set(('cancel', 'form', 'result', 'submit'))

    def __init__(self, *args, **kwargs):
        title = None
@@ -81,6 +81,18 @@ class Form(ElementBase):
        self.append(field)
        return field

+    def getXML(self, type='submit'):
+        self['type'] = type
+        log.warning("Form.getXML() is deprecated API compatibility " + \
+                    "with plugins/old_0004.py")
+        return self.xml
+
+    def fromXML(self, xml):
+        log.warning("Form.fromXML() is deprecated API compatibility " + \
+                    "with plugins/old_0004.py")
+        n = Form(xml=xml)
+        return n
+
    def add_item(self, values):
        itemXML = ET.Element('{%s}item' % self.namespace)
        self.xml.append(itemXML)
@@ -184,13 +196,13 @@ class Form(ElementBase):
        for var, field in fields:
            field['var'] = var
            self.add_field(
-                var=field.get('var'),
-                label=field.get('label'),
-                desc=field.get('desc'),
-                required=field.get('required'),
-                value=field.get('value'),
-                options=field.get('options'),
-                type=field.get('type'))
+                var = field.get('var'),
+                label = field.get('label'),
+                desc = field.get('desc'),
+                required = field.get('required'),
+                value = field.get('value'),
+                options = field.get('options'),
+                type = field.get('type'))

    def set_instructions(self, instructions):
        del self['instructions']
@@ -209,7 +221,7 @@ class Form(ElementBase):

    def set_reported(self, reported):
        """
-        This either needs a dictionary of dictionaries or a dictionary of form fields.
+        This either needs a dictionary or dictionaries or a dictionary of form fields.
        :param reported:
        :return:
        """
--- a/slixmpp/plugins/xep_0009/init.py
+++ b/slixmpp/plugins/xep_0009/init.py
@@ -14,3 +14,7 @@ from slixmpp.plugins.xep_0009.stanza import RPCQuery, MethodCall, MethodResponse


 register_plugin(XEP_0009)
+
+
+# Retain some backwards compatibility
+xep_0009 = XEP_0009
--- a/slixmpp/plugins/xep_0009/binding.py
+++ b/slixmpp/plugins/xep_0009/binding.py
@@ -25,7 +25,7 @@ def fault2xml(fault):

 def xml2fault(params):
    vals = []
-    for value in params.xml.findall('{%s}value' % _namespace):
+    for value in params.findall('{%s}value' % _namespace):
        vals.append(_xml2py(value))
    fault = dict()
    fault['code'] = vals[0]['faultCode']
@@ -98,34 +98,33 @@ def xml2py(params):

 def _xml2py(value):
    namespace = 'jabber:iq:rpc'
-    find_value = value.find
-    if find_value('{%s}nil' % namespace) is not None:
+    if value.find('{%s}nil' % namespace) is not None:
        return None
-    if find_value('{%s}i4' % namespace) is not None:
-        return int(find_value('{%s}i4' % namespace).text)
-    if find_value('{%s}int' % namespace) is not None:
-        return int(find_value('{%s}int' % namespace).text)
-    if find_value('{%s}boolean' % namespace) is not None:
-        return bool(int(find_value('{%s}boolean' % namespace).text))
-    if find_value('{%s}string' % namespace) is not None:
-        return find_value('{%s}string' % namespace).text
-    if find_value('{%s}double' % namespace) is not None:
-        return float(find_value('{%s}double' % namespace).text)
-    if find_value('{%s}base64' % namespace) is not None:
-        return rpcbase64(find_value('{%s}base64' % namespace).text.encode())
-    if find_value('{%s}Base64' % namespace) is not None:
+    if value.find('{%s}i4' % namespace) is not None:
+        return int(value.find('{%s}i4' % namespace).text)
+    if value.find('{%s}int' % namespace) is not None:
+        return int(value.find('{%s}int' % namespace).text)
+    if value.find('{%s}boolean' % namespace) is not None:
+        return bool(int(value.find('{%s}boolean' % namespace).text))
+    if value.find('{%s}string' % namespace) is not None:
+        return value.find('{%s}string' % namespace).text
+    if value.find('{%s}double' % namespace) is not None:
+        return float(value.find('{%s}double' % namespace).text)
+    if value.find('{%s}base64' % namespace) is not None:
+        return rpcbase64(value.find('{%s}base64' % namespace).text.encode())
+    if value.find('{%s}Base64' % namespace) is not None:
        # Older versions of XEP-0009 used Base64
-        return rpcbase64(find_value('{%s}Base64' % namespace).text.encode())
-    if find_value('{%s}dateTime.iso8601' % namespace) is not None:
-        return rpctime(find_value('{%s}dateTime.iso8601' % namespace).text)
-    if find_value('{%s}struct' % namespace) is not None:
+        return rpcbase64(value.find('{%s}Base64' % namespace).text.encode())
+    if value.find('{%s}dateTime.iso8601' % namespace) is not None:
+        return rpctime(value.find('{%s}dateTime.iso8601' % namespace).text)
+    if value.find('{%s}struct' % namespace) is not None:
        struct = {}
-        for member in find_value('{%s}struct' % namespace).findall('{%s}member' % namespace):
+        for member in value.find('{%s}struct' % namespace).findall('{%s}member' % namespace):
            struct[member.find('{%s}name' % namespace).text] = _xml2py(member.find('{%s}value' % namespace))
        return struct
-    if find_value('{%s}array' % namespace) is not None:
+    if value.find('{%s}array' % namespace) is not None:
        array = []
-        for val in find_value('{%s}array' % namespace).find('{%s}data' % namespace).findall('{%s}value' % namespace):
+        for val in value.find('{%s}array' % namespace).find('{%s}data' % namespace).findall('{%s}value' % namespace):
            array.append(_xml2py(val))
        return array
    raise ValueError()
--- a/slixmpp/plugins/xep_0009/remote.py
+++ b/slixmpp/plugins/xep_0009/remote.py
@@ -61,7 +61,7 @@ def _intercept(method, name, public):
        except InvocationException:
            raise
        except Exception as e:
-            raise InvocationException("A problem occurred calling %s.%s!" % (instance.FQN(), method.__name__), e)
+            raise InvocationException("A problem occured calling %s.%s!" % (instance.FQN(), method.__name__), e)
    _resolver._rpc = public
    _resolver._rpc_name = method.__name__ if name is None else name
    return _resolver
@@ -163,7 +163,7 @@ class ACL:

    @classmethod
    def _next_token(cls, expression, index):
-        new_index = expression.xml.find('*', index)
+        new_index = expression.find('*', index)
        if new_index == 0:
            return ''
        else:
@@ -182,7 +182,7 @@ class ACL:
            #! print "[TOKEN] '%s'" % token
            size = len(token)
            if size > 0:
-                token_index = value.xml.find(token, position)
+                token_index = value.find(token, position)
                if token_index == -1:
                    return False
                else:
@@ -405,10 +405,8 @@ class Proxy(Endpoint):
        self._callback = callback

    def __getattribute__(self, name, *args):
-        if name in ('__dict__', '_endpoint', '_callback'):
+        if name in ('__dict__', '_endpoint', 'async', '_callback'):
            return object.__getattribute__(self, name)
-        elif name == 'async':
-            return lambda callback: Proxy(self._endpoint, callback)
        else:
            attribute = self._endpoint.__getattribute__(name)
            if hasattr(attribute, '__call__'):
@@ -422,6 +420,9 @@ class Proxy(Endpoint):
                    pass   # If the attribute doesn't exist, don't care!
            return attribute

+    def async(self, callback):
+        return Proxy(self._endpoint, callback)
+
    def get_endpoint(self):
        '''
        Returns the proxified endpoint.
@@ -695,7 +696,7 @@ class RemoteSession(object):
        e = {
            'item-not-found': RemoteException("No remote handler available for %s at %s!" % (pmethod, iq['from'])),
            'forbidden': AuthorizationException("Forbidden to invoke remote handler for %s at %s!" % (pmethod, iq['from'])),
-            'undefined-condition': RemoteException("An unexpected problem occurred trying to invoke %s at %s!" % (pmethod, iq['from'])),
+            'undefined-condition': RemoteException("An unexpected problem occured trying to invoke %s at %s!" % (pmethod, iq['from'])),
        }[condition]
        if e is None:
            RemoteException("An unexpected exception occurred at %s!" % iq['from'])
--- a/slixmpp/plugins/xep_0009/rpc.py
+++ b/slixmpp/plugins/xep_0009/rpc.py
@@ -24,7 +24,7 @@ class XEP_0009(BasePlugin):

    name = 'xep_0009'
    description = 'XEP-0009: Jabber-RPC'
-    dependencies = {'xep_0030'}
+    dependencies = set(['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()
-        iq.error().set_payload(payload)
+        error().set_payload(payload)
        iq['error']['code'] = '404'
        iq['error']['type'] = 'wait'
        iq['error']['condition'] = 'recipient-unavailable'
--- a/slixmpp/plugins/xep_0009/stanza/RPC.py
+++ b/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 = {}
-    subinterfaces = {}
+    interfaces = set(())
+    subinterfaces = set(())
    plugin_attrib_map = {}
    plugin_tag_map = {}

@@ -24,8 +24,8 @@ class MethodCall(ElementBase):
    name = 'methodCall'
    namespace = 'jabber:iq:rpc'
    plugin_attrib = 'method_call'
-    interfaces = {'method_name', 'params'}
-    subinterfaces = {}
+    interfaces = set(('method_name', 'params'))
+    subinterfaces = set(())
    plugin_attrib_map = {}
    plugin_tag_map = {}

@@ -46,8 +46,8 @@ class MethodResponse(ElementBase):
    name = 'methodResponse'
    namespace = 'jabber:iq:rpc'
    plugin_attrib = 'method_response'
-    interfaces = {'params', 'fault'}
-    subinterfaces = {}
+    interfaces = set(('params', 'fault'))
+    subinterfaces = set(())
    plugin_attrib_map = {}
    plugin_tag_map = {}

--- a/slixmpp/plugins/xep_0012/init.py
+++ b/slixmpp/plugins/xep_0012/init.py
@@ -13,3 +13,7 @@ from slixmpp.plugins.xep_0012.last_activity import XEP_0012


 register_plugin(XEP_0012)
+
+
+# Retain some backwards compatibility
+xep_0004 = XEP_0012
--- a/slixmpp/plugins/xep_0012/last_activity.py
+++ b/slixmpp/plugins/xep_0012/last_activity.py
@@ -29,7 +29,7 @@ class XEP_0012(BasePlugin):

    name = 'xep_0012'
    description = 'XEP-0012: Last Activity'
-    dependencies = {'xep_0030'}
+    dependencies = set(['xep_0030'])
    stanza = stanza

    def plugin_init(self):
@@ -66,7 +66,7 @@ class XEP_0012(BasePlugin):
        self.del_last_activity(jid)

    def start_uptime(self, status=None):
-        self.set_last_activity(None, 0, status)
+        self.set_last_activity(jid, 0, status)

    def set_last_activity(self, jid=None, seconds=None, status=None):
        self.api['set_last_activity'](jid, args={
--- a/slixmpp/plugins/xep_0012/stanza.py
+++ b/slixmpp/plugins/xep_0012/stanza.py
@@ -14,7 +14,7 @@ class LastActivity(ElementBase):
    name = 'query'
    namespace = 'jabber:iq:last'
    plugin_attrib = 'last_activity'
-    interfaces = {'seconds', 'status'}
+    interfaces = set(('seconds', 'status'))

    def get_seconds(self):
        return int(self._get_attr('seconds'))
--- a/slixmpp/plugins/xep_0013/offline.py
+++ b/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 = {'xep_0030'}
+    dependencies = set(['xep_0030'])
    stanza = stanza

    def plugin_init(self):
--- a/slixmpp/plugins/xep_0013/stanza.py
+++ b/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 = {'fetch', 'purge', 'results'}
+    interfaces = set(['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 = {'action', 'node', 'jid'}
+    interfaces = set(['action', 'node', 'jid'])

-    actions = {'view', 'remove'}
+    actions = set(['view', 'remove'])

    def get_jid(self):
        return JID(self._get_attr('jid'))
--- a/slixmpp/plugins/xep_0016/privacy.py
+++ b/slixmpp/plugins/xep_0016/privacy.py
@@ -17,7 +17,7 @@ class XEP_0016(BasePlugin):

    name = 'xep_0016'
    description = 'XEP-0016: Privacy Lists'
-    dependencies = {'xep_0030'}
+    dependencies = set(['xep_0030'])
    stanza = stanza

    def plugin_init(self):
--- a/slixmpp/plugins/xep_0016/stanza.py
+++ b/slixmpp/plugins/xep_0016/stanza.py
@@ -18,14 +18,14 @@ class Active(ElementBase):
    name = 'active'
    namespace = 'jabber:iq:privacy'
    plugin_attrib = name
-    interfaces = {'name'}
+    interfaces = set(['name'])


 class Default(ElementBase):
    name = 'default'
    namespace = 'jabber:iq:privacy'
    plugin_attrib = name
-    interfaces = {'name'}
+    interfaces = set(['name'])


 class List(ElementBase):
@@ -33,7 +33,7 @@ class List(ElementBase):
    namespace = 'jabber:iq:privacy'
    plugin_attrib = name
    plugin_multi_attrib = 'lists'
-    interfaces = {'name'}
+    interfaces = set(['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 = {'type', 'value', 'action', 'order', 'iq',
-                  'message', 'presence_in', 'presence_out'}
-    bool_interfaces = {'message', 'iq', 'presence_in', 'presence_out'}
+    interfaces = set(['type', 'value', 'action', 'order', 'iq',
+                      'message', 'presence_in', 'presence_out'])
+    bool_interfaces = set(['message', 'iq', 'presence_in', 'presence_out'])

    type_values = ('', 'jid', 'group', 'subscription')
    action_values = ('allow', 'deny')
--- a/slixmpp/plugins/xep_0020/feature_negotiation.py
+++ b/slixmpp/plugins/xep_0020/feature_negotiation.py
@@ -24,7 +24,7 @@ class XEP_0020(BasePlugin):

    name = 'xep_0020'
    description = 'XEP-0020: Feature Negotiation'
-    dependencies = {'xep_0004', 'xep_0030'}
+    dependencies = set(['xep_0004', 'xep_0030'])
    stanza = stanza

    def plugin_init(self):
--- a/slixmpp/plugins/xep_0027/stanza.py
+++ b/slixmpp/plugins/xep_0027/stanza.py
@@ -13,7 +13,7 @@ class Signed(ElementBase):
    name = 'x'
    namespace = 'jabber:x:signed'
    plugin_attrib = 'signed'
-    interfaces = {'signed'}
+    interfaces = set(['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 = {'encrypted'}
+    interfaces = set(['encrypted'])
    is_extension = True

    def set_encrypted(self, value):
--- a/slixmpp/plugins/xep_0030/init.py
+++ b/slixmpp/plugins/xep_0030/init.py
@@ -15,3 +15,8 @@ from slixmpp.plugins.xep_0030.disco import XEP_0030


 register_plugin(XEP_0030)
+
+# Retain some backwards compatibility
+xep_0030 = XEP_0030
+XEP_0030.getInfo = XEP_0030.get_info
+XEP_0030.make_static = XEP_0030.restore_defaults
--- a/slixmpp/plugins/xep_0030/disco.py
+++ b/slixmpp/plugins/xep_0030/disco.py
@@ -6,7 +6,6 @@
    See the file LICENSE for copying permission.
 """

-import asyncio
 import logging

 from slixmpp import Iq
@@ -124,8 +123,6 @@ class XEP_0030(BasePlugin):
        for op in self._disco_ops:
            self.api.register(getattr(self.static, op), op, default=True)

-        self.domain_infos = {}
-
    def session_bind(self, jid):
        self.add_feature('http://jabber.org/protocol/disco#info')

@@ -298,31 +295,6 @@ class XEP_0030(BasePlugin):
                'cached': cached}
        return self.api['has_identity'](jid, node, ifrom, data)

-    async def get_info_from_domain(self, domain=None, timeout=None,
-                                   cached=True, callback=None, **kwargs):
-        if domain is None:
-            domain = self.xmpp.boundjid.domain
-
-        if not cached or domain not in self.domain_infos:
-            infos = [self.get_info(
-                domain, timeout=timeout, **kwargs)]
-            iq_items = await self.get_items(
-                domain, timeout=timeout, **kwargs)
-            items = iq_items['disco_items']['items']
-            infos += [
-                self.get_info(item[0], timeout=timeout, **kwargs)
-                for item in items]
-            info_futures, _ = await asyncio.wait(infos, timeout=timeout)
-
-            self.domain_infos[domain] = [
-                future.result() for future in info_futures]
-
-        results = self.domain_infos[domain]
-
-        if callback is not None:
-            callback(results)
-        return results
-
    @future_wrapper
    def get_info(self, jid=None, node=None, local=None,
                       cached=None, **kwargs):
@@ -674,11 +646,9 @@ class XEP_0030(BasePlugin):
                info['id'] = iq['id']
                info.send()
            else:
-                node = iq['disco_info']['node']
                iq = iq.reply()
                if info:
                    info = self._fix_default_info(info)
-                    info['node'] = node
                    iq.set_payload(info.xml)
                iq.send()
        elif iq['type'] == 'result':
--- a/slixmpp/plugins/xep_0030/stanza/info.py
+++ b/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 = {'node', 'features', 'identities'}
-    lang_interfaces = {'identities'}
+    interfaces = set(('node', 'features', 'identities'))
+    lang_interfaces = set(('identities',))

    # Cache identities and features
    _identities = set()
@@ -91,7 +91,7 @@ class DiscoInfo(ElementBase):
        """
        ElementBase.setup(self, xml)

-        self._identities = {id[0:3] for id in self['identities']}
+        self._identities = set([id[0:3] for id in self['identities']])
        self._features = self['features']

    def add_identity(self, category, itype, name=None, lang=None):
@@ -137,7 +137,7 @@ class DiscoInfo(ElementBase):
        identity = (category, itype, lang)
        if identity in self._identities:
            self._identities.remove(identity)
-            for id_xml in self.xml.findall('{%s}identity' % self.namespace):
+            for id_xml in self.findall('{%s}identity' % self.namespace):
                id = (id_xml.attrib['category'],
                      id_xml.attrib['type'],
                      id_xml.attrib.get('{%s}lang' % self.xml_ns, None))
@@ -163,7 +163,7 @@ class DiscoInfo(ElementBase):
            identities = set()
        else:
            identities = []
-        for id_xml in self.xml.findall('{%s}identity' % self.namespace):
+        for id_xml in self.findall('{%s}identity' % self.namespace):
            xml_lang = id_xml.attrib.get('{%s}lang' % self.xml_ns, None)
            if lang is None or xml_lang == lang:
                id = (id_xml.attrib['category'],
@@ -205,7 +205,7 @@ class DiscoInfo(ElementBase):
        Arguments:
            lang -- Optional, standard xml:lang value.
        """
-        for id_xml in self.xml.findall('{%s}identity' % self.namespace):
+        for id_xml in self.findall('{%s}identity' % self.namespace):
            if lang is None:
                self.xml.remove(id_xml)
            elif id_xml.attrib.get('{%s}lang' % self.xml_ns, None) == lang:
@@ -239,7 +239,7 @@ class DiscoInfo(ElementBase):
        """
        if feature in self._features:
            self._features.remove(feature)
-            for feature_xml in self.xml.findall('{%s}feature' % self.namespace):
+            for feature_xml in self.findall('{%s}feature' % self.namespace):
                if feature_xml.attrib['var'] == feature:
                    self.xml.remove(feature_xml)
                    return True
@@ -251,7 +251,7 @@ class DiscoInfo(ElementBase):
            features = set()
        else:
            features = []
-        for feature_xml in self.xml.findall('{%s}feature' % self.namespace):
+        for feature_xml in self.findall('{%s}feature' % self.namespace):
            if dedupe:
                features.add(feature_xml.attrib['var'])
            else:
@@ -272,5 +272,5 @@ class DiscoInfo(ElementBase):
    def del_features(self):
        """Remove all features."""
        self._features = set()
-        for feature_xml in self.xml.findall('{%s}feature' % self.namespace):
+        for feature_xml in self.findall('{%s}feature' % self.namespace):
            self.xml.remove(feature_xml)
--- a/slixmpp/plugins/xep_0030/stanza/items.py
+++ b/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 = {'node', 'items'}
+    interfaces = set(('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 = {item[0:2] for item in self['items']}
+        self._items = set([item[0:2] for item in self['items']])

    def add_item(self, jid, node=None, name=None):
        """
@@ -95,7 +95,7 @@ class DiscoItems(ElementBase):
            node -- Optional extra identifying information.
        """
        if (jid, node) in self._items:
-            for item_xml in self.xml.findall('{%s}item' % self.namespace):
+            for item_xml in self.findall('{%s}item' % self.namespace):
                item = (item_xml.attrib['jid'],
                        item_xml.attrib.get('node', None))
                if item == (jid, node):
@@ -138,7 +138,7 @@ class DiscoItem(ElementBase):
    name = 'item'
    namespace = 'http://jabber.org/protocol/disco#items'
    plugin_attrib = name
-    interfaces = {'jid', 'node', 'name'}
+    interfaces = set(('jid', 'node', 'name'))

    def get_node(self):
        """Return the item's node name or ``None``."""
--- a/slixmpp/plugins/xep_0030/static.py
+++ b/slixmpp/plugins/xep_0030/static.py
@@ -7,6 +7,7 @@
 """

 import logging
+import threading

 from slixmpp import Iq
 from slixmpp.exceptions import XMPPError, IqError, IqTimeout
@@ -47,6 +48,7 @@ class StaticDisco(object):
        self.nodes = {}
        self.xmpp = xmpp
        self.disco = disco
+        self.lock = threading.RLock()

    def add_node(self, jid=None, node=None, ifrom=None):
        """
@@ -57,46 +59,48 @@ class StaticDisco(object):
            jid  -- The JID that will own the new stanzas.
            node -- The node that will own the new stanzas.
        """
-        if jid is None:
-            jid = self.xmpp.boundjid.full
-        if node is None:
-            node = ''
-        if ifrom is None:
-            ifrom = ''
-        if isinstance(ifrom, JID):
-            ifrom = ifrom.full
-        if (jid, node, ifrom) not in self.nodes:
-            new_node = {'info': DiscoInfo(), 'items': DiscoItems()}
-            new_node['info']['node'] = node
-            new_node['items']['node'] = node
-            self.nodes[(jid, node, ifrom)] = new_node
-        return self.nodes[(jid, node, ifrom)]
+        with self.lock:
+            if jid is None:
+                jid = self.xmpp.boundjid.full
+            if node is None:
+                node = ''
+            if ifrom is None:
+                ifrom = ''
+            if isinstance(ifrom, JID):
+                ifrom = ifrom.full
+            if (jid, node, ifrom) not in self.nodes:
+                self.nodes[(jid, node, ifrom)] = {'info': DiscoInfo(),
+                                           'items': DiscoItems()}
+                self.nodes[(jid, node, ifrom)]['info']['node'] = node
+                self.nodes[(jid, node, ifrom)]['items']['node'] = node

    def get_node(self, jid=None, node=None, ifrom=None):
-        if jid is None:
-            jid = self.xmpp.boundjid.full
-        if node is None:
-            node = ''
-        if ifrom is None:
-            ifrom = ''
-        if isinstance(ifrom, JID):
-            ifrom = ifrom.full
-        if (jid, node, ifrom) not in self.nodes:
-            self.add_node(jid, node, ifrom)
-        return self.nodes[(jid, node, ifrom)]
+        with self.lock:
+            if jid is None:
+                jid = self.xmpp.boundjid.full
+            if node is None:
+                node = ''
+            if ifrom is None:
+                ifrom = ''
+            if isinstance(ifrom, JID):
+                ifrom = ifrom.full
+            if (jid, node, ifrom) not in self.nodes:
+                self.add_node(jid, node, ifrom)
+            return self.nodes[(jid, node, ifrom)]

    def node_exists(self, jid=None, node=None, ifrom=None):
-        if jid is None:
-            jid = self.xmpp.boundjid.full
-        if node is None:
-            node = ''
-        if ifrom is None:
-            ifrom = ''
-        if isinstance(ifrom, JID):
-            ifrom = ifrom.full
-        if (jid, node, ifrom) not in self.nodes:
-            return False
-        return True
+        with self.lock:
+            if jid is None:
+                jid = self.xmpp.boundjid.full
+            if node is None:
+                node = ''
+            if ifrom is None:
+                ifrom = ''
+            if isinstance(ifrom, JID):
+                ifrom = ifrom.full
+            if (jid, node, ifrom) not in self.nodes:
+                return False
+            return True

    # =================================================================
    # Node Handlers
@@ -195,13 +199,14 @@ class StaticDisco(object):

        The data parameter is not used.
        """
-        if not self.node_exists(jid, node):
-            if not node:
-                return DiscoInfo()
+        with self.lock:
+            if not self.node_exists(jid, node):
+                if not node:
+                    return DiscoInfo()
+                else:
+                    raise XMPPError(condition='item-not-found')
            else:
-                raise XMPPError(condition='item-not-found')
-        else:
-            return self.get_node(jid, node)['info']
+                return self.get_node(jid, node)['info']

    def set_info(self, jid, node, ifrom, data):
        """
@@ -209,8 +214,9 @@ class StaticDisco(object):

        The data parameter is a disco#info substanza.
        """
-        new_node = self.add_node(jid, node)
-        new_node['info'] = data
+        with self.lock:
+            self.add_node(jid, node)
+            self.get_node(jid, node)['info'] = data

    def del_info(self, jid, node, ifrom, data):
        """
@@ -218,8 +224,9 @@ class StaticDisco(object):

        The data parameter is not used.
        """
-        if self.node_exists(jid, node):
-            self.get_node(jid, node)['info'] = DiscoInfo()
+        with self.lock:
+            if self.node_exists(jid, node):
+                self.get_node(jid, node)['info'] = DiscoInfo()

    def get_items(self, jid, node, ifrom, data):
        """
@@ -227,13 +234,14 @@ class StaticDisco(object):

        The data parameter is not used.
        """
-        if not self.node_exists(jid, node):
-            if not node:
-                return DiscoItems()
+        with self.lock:
+            if not self.node_exists(jid, node):
+                if not node:
+                    return DiscoItems()
+                else:
+                    raise XMPPError(condition='item-not-found')
            else:
-                raise XMPPError(condition='item-not-found')
-        else:
-            return self.get_node(jid, node)['items']
+                return self.get_node(jid, node)['items']

    def set_items(self, jid, node, ifrom, data):
        """
@@ -242,9 +250,10 @@ class StaticDisco(object):
        The data parameter may provide:
            items -- A set of items in tuple format.
        """
-        items = data.get('items', set())
-        new_node = self.add_node(jid, node)
-        new_node['items']['items'] = items
+        with self.lock:
+            items = data.get('items', set())
+            self.add_node(jid, node)
+            self.get_node(jid, node)['items']['items'] = items

    def del_items(self, jid, node, ifrom, data):
        """
@@ -252,12 +261,13 @@ class StaticDisco(object):

        The data parameter is not used.
        """
-        if self.node_exists(jid, node):
-            self.get_node(jid, node)['items'] = DiscoItems()
+        with self.lock:
+            if self.node_exists(jid, node):
+                self.get_node(jid, node)['items'] = DiscoItems()

    def add_identity(self, jid, node, ifrom, data):
        """
-        Add a new identity to the JID/node combination.
+        Add a new identity to te JID/node combination.

        The data parameter may provide:
            category -- The general category to which the agent belongs.
@@ -265,12 +275,13 @@ class StaticDisco(object):
            name     -- Optional human readable name for this identity.
            lang     -- Optional standard xml:lang value.
        """
-        new_node = self.add_node(jid, node)
-        new_node['info'].add_identity(
-                data.get('category', ''),
-                data.get('itype', ''),
-                data.get('name', None),
-                data.get('lang', None))
+        with self.lock:
+            self.add_node(jid, node)
+            self.get_node(jid, node)['info'].add_identity(
+                    data.get('category', ''),
+                    data.get('itype', ''),
+                    data.get('name', None),
+                    data.get('lang', None))

    def set_identities(self, jid, node, ifrom, data):
        """
@@ -280,9 +291,10 @@ class StaticDisco(object):
            identities -- A list of identities in tuple form:
                            (category, type, name, lang)
        """
-        identities = data.get('identities', set())
-        new_node = self.add_node(jid, node)
-        new_node['info']['identities'] = identities
+        with self.lock:
+            identities = data.get('identities', set())
+            self.add_node(jid, node)
+            self.get_node(jid, node)['info']['identities'] = identities

    def del_identity(self, jid, node, ifrom, data):
        """
@@ -294,12 +306,13 @@ class StaticDisco(object):
            name     -- Optional human readable name for this identity.
            lang     -- Optional, standard xml:lang value.
        """
-        if self.node_exists(jid, node):
-            self.get_node(jid, node)['info'].del_identity(
-                    data.get('category', ''),
-                    data.get('itype', ''),
-                    data.get('name', None),
-                    data.get('lang', None))
+        with self.lock:
+            if self.node_exists(jid, node):
+                self.get_node(jid, node)['info'].del_identity(
+                        data.get('category', ''),
+                        data.get('itype', ''),
+                        data.get('name', None),
+                        data.get('lang', None))

    def del_identities(self, jid, node, ifrom, data):
        """
@@ -307,8 +320,9 @@ class StaticDisco(object):

        The data parameter is not used.
        """
-        if self.node_exists(jid, node):
-            del self.get_node(jid, node)['info']['identities']
+        with self.lock:
+            if self.node_exists(jid, node):
+                del self.get_node(jid, node)['info']['identities']

    def add_feature(self, jid, node, ifrom, data):
        """
@@ -317,9 +331,10 @@ class StaticDisco(object):
        The data parameter should include:
            feature -- The namespace of the supported feature.
        """
-        new_node = self.add_node(jid, node)
-        new_node['info'].add_feature(
-                data.get('feature', ''))
+        with self.lock:
+            self.add_node(jid, node)
+            self.get_node(jid, node)['info'].add_feature(
+                    data.get('feature', ''))

    def set_features(self, jid, node, ifrom, data):
        """
@@ -328,9 +343,10 @@ class StaticDisco(object):
        The data parameter should include:
            features -- The new set of supported features.
        """
-        features = data.get('features', set())
-        new_node = self.add_node(jid, node)
-        new_node['info']['features'] = features
+        with self.lock:
+            features = data.get('features', set())
+            self.add_node(jid, node)
+            self.get_node(jid, node)['info']['features'] = features

    def del_feature(self, jid, node, ifrom, data):
        """
@@ -339,9 +355,10 @@ class StaticDisco(object):
        The data parameter should include:
            feature -- The namespace of the removed feature.
        """
-        if self.node_exists(jid, node):
-            self.get_node(jid, node)['info'].del_feature(
-                    data.get('feature', ''))
+        with self.lock:
+            if self.node_exists(jid, node):
+                self.get_node(jid, node)['info'].del_feature(
+                        data.get('feature', ''))

    def del_features(self, jid, node, ifrom, data):
        """
@@ -349,9 +366,10 @@ class StaticDisco(object):

        The data parameter is not used.
        """
-        if not self.node_exists(jid, node):
-            return
-        del self.get_node(jid, node)['info']['features']
+        with self.lock:
+            if not self.node_exists(jid, node):
+                return
+            del self.get_node(jid, node)['info']['features']

    def add_item(self, jid, node, ifrom, data):
        """
@@ -363,11 +381,12 @@ class StaticDisco(object):
                     non-addressable items.
            name  -- Optional human readable name for the item.
        """
-        new_node = self.add_node(jid, node)
-        new_node['items'].add_item(
-                data.get('ijid', ''),
-                node=data.get('inode', ''),
-                name=data.get('name', ''))
+        with self.lock:
+            self.add_node(jid, node)
+            self.get_node(jid, node)['items'].add_item(
+                    data.get('ijid', ''),
+                    node=data.get('inode', ''),
+                    name=data.get('name', ''))

    def del_item(self, jid, node, ifrom, data):
        """
@@ -377,10 +396,11 @@ class StaticDisco(object):
            ijid  -- JID of the item to remove.
            inode -- Optional extra identifying information.
        """
-        if self.node_exists(jid, node):
-            self.get_node(jid, node)['items'].del_item(
-                    data.get('ijid', ''),
-                    node=data.get('inode', None))
+        with self.lock:
+            if self.node_exists(jid, node):
+                self.get_node(jid, node)['items'].del_item(
+                        data.get('ijid', ''),
+                        node=data.get('inode', None))

    def cache_info(self, jid, node, ifrom, data):
        """
@@ -390,11 +410,12 @@ class StaticDisco(object):
        containing the disco info to cache, or
        the disco#info substanza itself.
        """
-        if isinstance(data, Iq):
-            data = data['disco_info']
+        with self.lock:
+            if isinstance(data, Iq):
+                data = data['disco_info']

-        new_node = self.add_node(jid, node, ifrom)
-        new_node['info'] = data
+            self.add_node(jid, node, ifrom)
+            self.get_node(jid, node, ifrom)['info'] = data

    def get_cached_info(self, jid, node, ifrom, data):
        """
@@ -402,7 +423,8 @@ class StaticDisco(object):

        The data parameter is not used.
        """
-        if not self.node_exists(jid, node, ifrom):
-            return None
-        else:
-            return self.get_node(jid, node, ifrom)['info']
+        with self.lock:
+            if not self.node_exists(jid, node, ifrom):
+                return None
+            else:
+                return self.get_node(jid, node, ifrom)['info']
--- a/slixmpp/plugins/xep_0033/init.py
+++ b/slixmpp/plugins/xep_0033/init.py
@@ -14,3 +14,7 @@ from slixmpp.plugins.xep_0033.addresses import XEP_0033


 register_plugin(XEP_0033)
+
+# Retain some backwards compatibility
+xep_0033 = XEP_0033
+Addresses.addAddress = Addresses.add_address
--- a/slixmpp/plugins/xep_0033/addresses.py
+++ b/slixmpp/plugins/xep_0033/addresses.py
@@ -22,7 +22,7 @@ class XEP_0033(BasePlugin):

    name = 'xep_0033'
    description = 'XEP-0033: Extended Stanza Addressing'
-    dependencies = {'xep_0030'}
+    dependencies = set(['xep_0030'])
    stanza = stanza

    def plugin_init(self):
--- a/slixmpp/plugins/xep_0033/stanza.py
+++ b/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 = {'type', 'jid', 'node', 'uri', 'desc', 'delivered'}
+    interfaces = set(['type', 'jid', 'node', 'uri', 'desc', 'delivered'])

-    address_types = {'bcc', 'cc', 'noreply', 'replyroom', 'replyto', 'to'}
+    address_types = set(('bcc', 'cc', 'noreply', 'replyroom', 'replyto', 'to'))

    def get_jid(self):
        return JID(self._get_attr('jid'))
@@ -117,12 +117,15 @@ 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:
+    setattr(Addresses, "get%s" % atype.title(), get_multi)
+    setattr(Addresses, "set%s" % atype.title(), set_multi)
+    setattr(Addresses, "del%s" % atype.title(), del_multi)
    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)
-
+        setattr(Addresses, "getAddresses", get_multi)
+        setattr(Addresses, "setAddresses", set_multi)
+        setattr(Addresses, "delAddresses", del_multi)


 register_stanza_plugin(Addresses, Address, iterable=True)
--- a/slixmpp/plugins/xep_0045.py
+++ b/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 = {'affiliation', 'role', 'jid', 'nick', 'room'}
-    affiliations = {'', }
-    roles = {'', }
+    interfaces = set(('affiliation', 'role', 'jid', 'nick', 'room'))
+    affiliations = set(('', ))
+    roles = set(('', ))

-    def get_xml_item(self):
+    def getXMLItem(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 get_affiliation(self):
+    def getAffiliation(self):
        #TODO if no affilation, set it to the default and return default
-        item = self.get_xml_item()
+        item = self.getXMLItem()
        return item.get('affiliation', '')

-    def set_affiliation(self, value):
-        item = self.get_xml_item()
+    def setAffiliation(self, value):
+        item = self.getXMLItem()
        #TODO check for valid affiliation
        item.attrib['affiliation'] = value
        return self

-    def del_affiliation(self):
-        item = self.get_xml_item()
+    def delAffiliation(self):
+        item = self.getXMLItem()
        #TODO set default affiliation
        if 'affiliation' in item.attrib: del item.attrib['affiliation']
        return self

-    def get_jid(self):
-        item = self.get_xml_item()
+    def getJid(self):
+        item = self.getXMLItem()
        return JID(item.get('jid', ''))

-    def set_jid(self, value):
-        item = self.get_xml_item()
+    def setJid(self, value):
+        item = self.getXMLItem()
        if not isinstance(value, str):
            value = str(value)
        item.attrib['jid'] = value
        return self

-    def del_jid(self):
-        item = self.get_xml_item()
+    def delJid(self):
+        item = self.getXMLItem()
        if 'jid' in item.attrib: del item.attrib['jid']
        return self

-    def get_role(self):
-        item = self.get_xml_item()
+    def getRole(self):
+        item = self.getXMLItem()
        #TODO get default role, set default role if none
        return item.get('role', '')

-    def set_role(self, value):
-        item = self.get_xml_item()
+    def setRole(self, value):
+        item = self.getXMLItem()
        #TODO check for valid role
        item.attrib['role'] = value
        return self

-    def del_role(self):
-        item = self.get_xml_item()
+    def delRole(self):
+        item = self.getXMLItem()
        #TODO set default role
        if 'role' in item.attrib: del item.attrib['role']
        return self

-    def get_nick(self):
+    def getNick(self):
        return self.parent()['from'].resource

-    def get_room(self):
+    def getRoom(self):
        return self.parent()['from'].bare

-    def set_nick(self, value):
+    def setNick(self, value):
        log.warning("Cannot set nick through mucpresence plugin.")
        return self

-    def set_room(self, value):
+    def setRoom(self, value):
        log.warning("Cannot set room through mucpresence plugin.")
        return self

-    def del_nick(self):
+    def delNick(self):
        log.warning("Cannot delete nick through mucpresence plugin.")
        return self

-    def del_room(self):
+    def delRoom(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 = {'xep_0030', 'xep_0004'}
+    dependencies = set(['xep_0030', 'xep_0004'])

    def plugin_init(self):
        self.rooms = {}
-        self.our_nicks = {}
+        self.ourNicks = {}
        self.xep = '0045'
        # load MUC support in presence stanzas
        register_stanza_plugin(Presence, MUCPresence)
@@ -160,7 +160,6 @@ class XEP_0045(BasePlugin):
        got_online = False
        if pr['muc']['room'] not in self.rooms.keys():
            return
-        self.xmpp.roster[pr['from']].ignore_updates = True
        entry = pr['muc'].get_stanza_values()
        entry['show'] = pr['show']
        entry['status'] = pr['status']
@@ -201,28 +200,28 @@ class XEP_0045(BasePlugin):
        """
        self.xmpp.event('groupchat_subject', msg)

-    def jid_in_room(self, room, jid):
+    def jidInRoom(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 get_nick(self, room, jid):
+    def getNick(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 configure_room(self, room, form=None, ifrom=None):
+    def configureRoom(self, room, form=None, ifrom=None):
        if form is None:
-            form = self.get_room_config(room, ifrom=ifrom)
+            form = self.getRoomConfig(room, ifrom=ifrom)
        iq = self.xmpp.make_iq_set()
        iq['to'] = room
        if ifrom is not None:
            iq['from'] = ifrom
        query = ET.Element('{http://jabber.org/protocol/muc#owner}query')
-        form['type'] = 'submit'
+        form = form.getXML('submit')
        query.append(form)
        iq.append(query)
        # For now, swallow errors to preserve existing API
@@ -234,7 +233,7 @@ class XEP_0045(BasePlugin):
            return False
        return True

-    def join_muc(self, room, nick, maxhistory="0", password='', wait=False, pstatus=None, pshow=None, pfrom=None):
+    def joinMUC(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 +257,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.our_nicks[room] = nick
+        self.ourNicks[room] = nick

    def destroy(self, room, reason='', altroom = '', ifrom=None):
        iq = self.xmpp.make_iq_set()
@@ -283,7 +282,7 @@ class XEP_0045(BasePlugin):
            return False
        return True

-    def set_affiliation(self, room, jid=None, nick=None, affiliation='member', ifrom=None):
+    def setAffiliation(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 +304,7 @@ class XEP_0045(BasePlugin):
            return False
        return True

-    def set_role(self, room, nick, role):
+    def setRole(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 +336,7 @@ class XEP_0045(BasePlugin):
        msg.append(x)
        self.xmpp.send(msg)

-    def leave_muc(self, room, nick, msg='', pfrom=None):
+    def leaveMUC(self, room, nick, msg='', pfrom=None):
        """ Leave the specified room.
        """
        if msg:
@@ -346,7 +345,7 @@ class XEP_0045(BasePlugin):
            self.xmpp.send_presence(pshow='unavailable', pto="%s/%s" % (room, nick), pfrom=pfrom)
        del self.rooms[room]

-    def get_room_config(self, room, ifrom=''):
+    def getRoomConfig(self, room, ifrom=''):
        iq = self.xmpp.make_iq_get('http://jabber.org/protocol/muc#owner')
        iq['to'] = room
        iq['from'] = ifrom
@@ -360,9 +359,9 @@ class XEP_0045(BasePlugin):
        form = result.xml.find('{http://jabber.org/protocol/muc#owner}query/{jabber:x:data}x')
        if form is None:
            raise ValueError
-        return self.xmpp.plugin['xep_0004'].build_form(form)
+        return self.xmpp.plugin['xep_0004'].buildForm(form)

-    def cancel_config(self, room, ifrom=None):
+    def cancelConfig(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,40 +370,40 @@ class XEP_0045(BasePlugin):
        iq['from'] = ifrom
        iq.send()

-    def set_room_config(self, room, config, ifrom=''):
+    def setRoomConfig(self, room, config, ifrom=''):
        query = ET.Element('{http://jabber.org/protocol/muc#owner}query')
-        config['type'] = 'submit'
-        query.append(config)
+        x = config.getXML('submit')
+        query.append(x)
        iq = self.xmpp.make_iq_set(query)
        iq['to'] = room
        iq['from'] = ifrom
        iq.send()

-    def get_joined_rooms(self):
+    def getJoinedRooms(self):
        return self.rooms.keys()

-    def get_our_jid_in_room(self, room_jid):
+    def getOurJidInRoom(self, roomJid):
        """ Return the jid we're using in a room.
        """
-        return "%s/%s" % (room_jid, self.our_nicks[room_jid])
+        return "%s/%s" % (roomJid, self.ourNicks[roomJid])

-    def get_jid_property(self, room, nick, jid_property):
+    def getJidProperty(self, room, nick, jidProperty):
        """ 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 jid_property in self.rooms[room][nick]:
-            return self.rooms[room][nick][jid_property]
+        if room in self.rooms and nick in self.rooms[room] and jidProperty in self.rooms[room][nick]:
+            return self.rooms[room][nick][jidProperty]
        else:
            return None

-    def get_roster(self, room):
+    def getRoster(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 get_users_by_affiliation(cls, room, affiliation='member', ifrom=None):
+    def getUsersByAffiliation(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,4 +414,5 @@ class XEP_0045(BasePlugin):
        return iq.send()


+xep_0045 = XEP_0045
 register_plugin(XEP_0045)
--- a/slixmpp/plugins/xep_0047/init.py
+++ b/slixmpp/plugins/xep_0047/init.py
@@ -15,3 +15,7 @@ from slixmpp.plugins.xep_0047.ibb import XEP_0047


 register_plugin(XEP_0047)
+
+
+# Retain some backwards compatibility
+xep_0047 = XEP_0047
--- a/slixmpp/plugins/xep_0047/ibb.py
+++ b/slixmpp/plugins/xep_0047/ibb.py
@@ -18,7 +18,7 @@ class XEP_0047(BasePlugin):

    name = 'xep_0047'
    description = 'XEP-0047: In-band Bytestreams'
-    dependencies = {'xep_0030'}
+    dependencies = set(['xep_0030'])
    stanza = stanza
    default_config = {
        'block_size': 4096,
--- a/slixmpp/plugins/xep_0047/stanza.py
+++ b/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 = {'block_size', 'sid', 'stanza'}
+    interfaces = set(('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 = {'seq', 'sid', 'data'}
-    sub_interfaces = {'data'}
+    interfaces = set(('seq', 'sid', 'data'))
+    sub_interfaces = set(['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 = {'sid'}
+    interfaces = set(['sid'])
--- a/slixmpp/plugins/xep_0047/stream.py
+++ b/slixmpp/plugins/xep_0047/stream.py
@@ -31,7 +31,8 @@ class IBBytestream(object):

        self.recv_queue = asyncio.Queue()

-    async def send(self, data, timeout=None):
+    @asyncio.coroutine
+    def send(self, data, timeout=None):
        if not self.stream_started or self.stream_out_closed:
            raise socket.error
        if len(data) > self.block_size:
@@ -55,20 +56,22 @@ class IBBytestream(object):
            iq['ibb_data']['sid'] = self.sid
            iq['ibb_data']['seq'] = seq
            iq['ibb_data']['data'] = data
-            await iq.send(timeout=timeout)
+            yield from iq.send(timeout=timeout)
        return len(data)

-    async def sendall(self, data, timeout=None):
+    @asyncio.coroutine
+    def sendall(self, data, timeout=None):
        sent_len = 0
        while sent_len < len(data):
-            sent_len += await self.send(data[sent_len:self.block_size], timeout=timeout)
+            sent_len += yield from self.send(data[sent_len:self.block_size], timeout=timeout)

-    async def sendfile(self, file, timeout=None):
+    @asyncio.coroutine
+    def sendfile(self, file, timeout=None):
        while True:
            data = file.read(self.block_size)
            if not data:
                break
-            await self.send(data, timeout=timeout)
+            yield from self.send(data, timeout=timeout)

    def _recv_data(self, stanza):
        new_seq = stanza['ibb_data']['seq']
--- a/slixmpp/plugins/xep_0048/bookmarks.py
+++ b/slixmpp/plugins/xep_0048/bookmarks.py
@@ -24,7 +24,7 @@ class XEP_0048(BasePlugin):

    name = 'xep_0048'
    description = 'XEP-0048: Bookmarks'
-    dependencies = {'xep_0045', 'xep_0049', 'xep_0060', 'xep_0163', 'xep_0223'}
+    dependencies = set(['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'].join_muc(conf['jid'], conf['nick'],
+                self.xmpp['xep_0045'].joinMUC(conf['jid'], conf['nick'],
                        password=conf['password'])

    def set_bookmarks(self, bookmarks, method=None, **iqargs):
--- a/Show More
+++ b/Show More