Do not copy the stanza before calling each handler

Use a deque for the idle list
Delay the handling of stanza for when the process is not busy
2015-01-03 18:42:57 +01:00 · 2015-01-03 16:13:39 +01:00 · 2015-01-03 06:08:03 +01:00 · 2014-12-17 19:03:49 +01:00 · 2014-12-11 19:27:13 +01:00 · 2014-12-11 14:46:52 +01:00
522 changed files with 7068 additions and 10775 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ docs/_build/
 *.swp
 .tox/
 .coverage
-sleekxmpp.egg-info/
+slixmpp.egg-info/
 .ropeproject/
 4913
 *~
--- a/README.rst
+++ b/README.rst
@@ -1,76 +1,12 @@
-SleekXMPP
+Slixmpp
 #########

-SleekXMPP is an MIT licensed XMPP library for Python 2.6/3.1+,
-and is featured in examples in
-`XMPP: The Definitive Guide <http://oreilly.com/catalog/9780596521271>`_ 
-by Kevin Smith, Remko Tronçon, and Peter Saint-Andre. If you've arrived
-here from reading the Definitive Guide, please see the notes on updating
-the examples to the latest version of SleekXMPP.
+Slixmpp is an MIT licensed XMPP library for Python 3.4+. It is a fork of
+SleekXMPP.

-SleekXMPP's design goals and philosphy are:
-
-**Low number of dependencies**
-    Installing and using SleekXMPP should be as simple as possible, without
-    having to deal with long dependency chains.
-
-    As part of reducing the number of dependencies, some third party
-    modules are included with SleekXMPP in the ``thirdparty`` directory.
-    Imports from this module first try to import an existing installed
-    version before loading the packaged version, when possible.
-
-**Every XEP as a plugin**
-    Following Python's "batteries included" approach, the goal is to
-    provide support for all currently active XEPs (final and draft). Since
-    adding XEP support is done through easy to create plugins, the hope is
-    to also provide a solid base for implementing and creating experimental
-    XEPs.
-
-**Rewarding to work with**
-    As much as possible, SleekXMPP should allow things to "just work" using
-    sensible defaults and appropriate abstractions. XML can be ugly to work
-    with, but it doesn't have to be that way.
-
-
-Get the Code
------------
-
-Get the latest stable version from PyPI::
-
-    pip install sleekxmpp
-
-The latest source code for SleekXMPP may be found on `Github
-<http://github.com/fritzy/SleekXMPP>`_. Releases can be found in the
-``master`` branch, while the latest development version is in the
-``develop`` branch.
-
-**Latest Release**
-    - `1.1.11 <http://github.com/fritzy/SleekXMPP/zipball/1.1.11>`_
-
-**Develop Releases**
-    - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_
-
-
-Installing DNSPython
---------------------
-If you are using Python3 and wish to use dnspython, you will have to checkout and
-install the ``python3`` branch::
-
-    git clone http://github.com/rthalley/dnspython
-    cd dnspython
-    git checkout python3
-    python3 setup.py install
-
-Discussion
----------
-A mailing list and XMPP chat room are available for discussing and getting
-help with SleekXMPP.
-
-**Mailing List**
-    `SleekXMPP Discussion on Google Groups <http://groups.google.com/group/sleekxmpp-discussion>`_
-
-**Chat**
-    `sleek@conference.jabber.org <xmpp:sleek@conference.jabber.org?join>`_
+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.


 Documentation and Testing
@@ -83,22 +19,22 @@ be in ``docs/_build/html``::
    make html
    open _build/html/index.html

-To run the test suite for SleekXMPP::
+To run the test suite for Slixmpp::

    python testall.py


-The SleekXMPP Boilerplate
+The Slixmpp Boilerplate
 -------------------------
-Projects using SleekXMPP tend to follow a basic pattern for setting up client/component
-connections and configuration. Here is the gist of the boilerplate needed for a SleekXMPP
+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 documetation or examples directory for more detailed archetypes for
-SleekXMPP projects::
+Slixmpp projects::

    import logging

-    from sleekxmpp import ClientXMPP
-    from sleekxmpp.exceptions import IqError, IqTimeout
+    from slixmpp import ClientXMPP
+    from slixmpp.exceptions import IqError, IqTimeout


    class EchoBot(ClientXMPP):
@@ -144,7 +80,7 @@ SleekXMPP projects::


    if __name__ == '__main__':
-        # Ideally use optparse or argparse to get JID, 
+        # Ideally use optparse or argparse to get JID,
        # password, and log level.

        logging.basicConfig(level=logging.DEBUG,
@@ -155,18 +91,25 @@ SleekXMPP projects::
        xmpp.process(block=True)


+Slixmpp Credits
+---------------
+
+**Maintainer of the slixmpp fork:** Florent Le Coz
+    `louiz@louiz.org <xmpp:louiz@louiz.org?message>`_,
+
 Credits
 -------
+
 **Main Author:** Nathan Fritz
-    `fritzy@netflint.net <xmpp:fritzy@netflint.net?message>`_, 
+    `fritzy@netflint.net <xmpp:fritzy@netflint.net?message>`_,
    `@fritzy <http://twitter.com/fritzy>`_

    Nathan is also the author of XMPPHP and `Seesmic-AS3-XMPP
-    <http://code.google.com/p/seesmic-as3-xmpp/>`_, and a former member of 
+    <http://code.google.com/p/seesmic-as3-xmpp/>`_, and a former member of
    the XMPP Council.

 **Co-Author:** Lance Stout
-    `lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_, 
+    `lancestout@gmail.com <xmpp:lancestout@gmail.com?message>`_,
    `@lancestout <http://twitter.com/lancestout>`_

 **Contributors:**
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -72,17 +72,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SleekXMPP.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Slixmpp.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SleekXMPP.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Slixmpp.qhc"

 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/SleekXMPP"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SleekXMPP"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Slixmpp"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Slixmpp"
 	@echo "# devhelp"

 epub:
--- a/docs/_static/nature.css
+++ b/docs/_static/nature.css
@@ -8,11 +8,11 @@
 * :license: BSD, see LICENSE for details.
 *
 */
- 
+
@import url("basic.css");
- 
+
 /* -- page layout ----------------------------------------------------------- */
- 
+
 body {
    font-family: Arial, sans-serif;
    font-size: 100%;
@@ -34,18 +34,18 @@ div.bodywrapper {
 hr {
    border: 1px solid #B1B4B6;
 }
- 
+
 div.document {
    background-color: #eee;
 }
- 
+
 div.body {
    background-color: #ffffff;
    color: #3E4349;
    padding: 0 30px 30px 30px;
    font-size: 0.9em;
 }
- 
+
 div.footer {
    color: #555;
    width: 100%;
@@ -53,12 +53,12 @@ div.footer {
    text-align: center;
    font-size: 75%;
 }
- 
+
 div.footer a {
    color: #444;
    text-decoration: underline;
 }
- 
+
 div.related {
    background-color: #6BA81E;
    line-height: 32px;
@@ -66,11 +66,11 @@ div.related {
    text-shadow: 0px 1px 0 #444;
    font-size: 0.9em;
 }
- 
+
 div.related a {
    color: #E2F3CC;
 }
- 
+
 div.sphinxsidebar {
    font-size: 0.75em;
    line-height: 1.5em;
@@ -79,7 +79,7 @@ div.sphinxsidebar {
 div.sphinxsidebarwrapper{
    padding: 20px 0;
 }
- 
+
 div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
    font-family: Arial, sans-serif;
@@ -95,30 +95,30 @@ div.sphinxsidebar h4 {
 div.sphinxsidebar h4{
    font-size: 1.1em;
 }
- 
+
 div.sphinxsidebar h3 a {
    color: #444;
 }
- 
- 
+
+
 div.sphinxsidebar p {
    color: #888;
    padding: 5px 20px;
 }
- 
+
 div.sphinxsidebar p.topless {
 }
- 
+
 div.sphinxsidebar ul {
    margin: 10px 20px;
    padding: 0;
    color: #000;
 }
- 
+
 div.sphinxsidebar a {
    color: #444;
 }
- 
+
 div.sphinxsidebar input {
    border: 1px solid #ccc;
    font-family: sans-serif;
@@ -128,19 +128,19 @@ div.sphinxsidebar input {
 div.sphinxsidebar input[type=text]{
    margin-left: 20px;
 }
- 
+
 /* -- body styles ----------------------------------------------------------- */
- 
+
 a {
    color: #005B81;
    text-decoration: none;
 }
- 
+
 a:hover {
    color: #E32E00;
    text-decoration: underline;
 }
- 
+
 div.body h1,
 div.body h2,
 div.body h3,
@@ -155,30 +155,30 @@ div.body h6 {
    padding: 5px 0 5px 10px;
    text-shadow: 0px 1px 0 white
 }
- 
+
 div.body h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; }
 div.body h2 { font-size: 150%; background-color: #C8D5E3; }
 div.body h3 { font-size: 120%; background-color: #D8DEE3; }
 div.body h4 { font-size: 110%; background-color: #D8DEE3; }
 div.body h5 { font-size: 100%; background-color: #D8DEE3; }
 div.body h6 { font-size: 100%; background-color: #D8DEE3; }
- 
+
 a.headerlink {
    color: #c60f0f;
    font-size: 0.8em;
    padding: 0 4px 0 4px;
    text-decoration: none;
 }
- 
+
 a.headerlink:hover {
    background-color: #c60f0f;
    color: white;
 }
- 
+
 div.body p, div.body dd, div.body li {
    line-height: 1.5em;
 }
- 
+
 div.admonition p.admonition-title + p {
    display: inline;
 }
@@ -191,29 +191,29 @@ div.note {
    background-color: #eee;
    border: 1px solid #ccc;
 }
- 
+
 div.seealso {
    background-color: #ffc;
    border: 1px solid #ff6;
 }
- 
+
 div.topic {
    background-color: #eee;
 }
- 
+
 div.warning {
    background-color: #ffe4e4;
    border: 1px solid #f66;
 }
- 
+
 p.admonition-title {
    display: inline;
 }
- 
+
 p.admonition-title:after {
    content: ":";
 }
- 
+
 pre {
    padding: 10px;
    background-color: White;
@@ -225,7 +225,7 @@ pre {
    -webkit-box-shadow: 1px 1px 1px #d8d8d8;
    -moz-box-shadow: 1px 1px 1px #d8d8d8;
 }
- 
+
 tt {
    background-color: #ecf0f3;
    color: #222;
--- a/docs/_static/sphinxdoc.css
+++ b/docs/_static/sphinxdoc.css
@@ -134,7 +134,7 @@ div.footer a {

 /* -- body styles ----------------------------------------------------------- */

-p {    
+p {
    margin: 0.8em 0 0.5em 0;
 }

--- a/docs/api/basexmpp.rst
+++ b/docs/api/basexmpp.rst
@@ -2,7 +2,7 @@
 BaseXMPP
 ========

-.. module:: sleekxmpp.basexmpp
+.. module:: slixmpp.basexmpp

 .. autoclass:: BaseXMPP
    :members:
--- a/docs/api/clientxmpp.rst
+++ b/docs/api/clientxmpp.rst
@@ -2,7 +2,7 @@
 ClientXMPP
 ==========

-.. module:: sleekxmpp.clientxmpp
+.. module:: slixmpp.clientxmpp

 .. autoclass:: ClientXMPP
    :members:
--- a/docs/api/componentxmpp.rst
+++ b/docs/api/componentxmpp.rst
@@ -2,7 +2,7 @@
 ComponentXMPP
 =============

-.. module:: sleekxmpp.componentxmpp
+.. module:: slixmpp.componentxmpp

 .. autoclass:: ComponentXMPP
    :members:
--- a/docs/api/exceptions.rst
+++ b/docs/api/exceptions.rst
@@ -1,9 +1,9 @@
 Exceptions
 ==========

-.. module:: sleekxmpp.exceptions
+.. module:: slixmpp.exceptions
+

-    
 .. autoexception:: XMPPError
    :members:

--- a/docs/api/xmlstream/filesocket.rst
+++ b/docs/api/xmlstream/filesocket.rst
@@ -1,4 +1,4 @@
-.. module:: sleekxmpp.xmlstream.filesocket
+.. module:: slixmpp.xmlstream.filesocket

 .. _filesocket:

--- a/docs/api/xmlstream/handler.rst
+++ b/docs/api/xmlstream/handler.rst
@@ -3,14 +3,14 @@ Stanza Handlers

 The Basic Handler
 -----------------
-.. module:: sleekxmpp.xmlstream.handler.base
+.. module:: slixmpp.xmlstream.handler.base

 .. autoclass:: BaseHandler
    :members:

 Callback
 --------
-.. module:: sleekxmpp.xmlstream.handler.callback
+.. module:: slixmpp.xmlstream.handler.callback

 .. autoclass:: Callback
    :members:
@@ -18,7 +18,7 @@ Callback

 Waiter
 ------
-.. module:: sleekxmpp.xmlstream.handler.waiter
+.. module:: slixmpp.xmlstream.handler.waiter

 .. autoclass:: Waiter
    :members:
--- a/docs/api/xmlstream/jid.rst
+++ b/docs/api/xmlstream/jid.rst
@@ -1,7 +1,7 @@
 Jabber IDs (JID)
 =================

-.. module:: sleekxmpp.xmlstream.jid
+.. module:: slixmpp.xmlstream.jid

 .. autoclass:: JID
    :members:
--- a/docs/api/xmlstream/matcher.rst
+++ b/docs/api/xmlstream/matcher.rst
@@ -3,7 +3,7 @@ Stanza Matchers

 The Basic Matcher
 -----------------
-.. module:: sleekxmpp.xmlstream.matcher.base
+.. module:: slixmpp.xmlstream.matcher.base

 .. autoclass:: MatcherBase
    :members:
@@ -11,7 +11,7 @@ The Basic Matcher

 ID Matching
 -----------
-.. module:: sleekxmpp.xmlstream.matcher.id
+.. module:: slixmpp.xmlstream.matcher.id

 .. autoclass:: MatcherId
    :members:
@@ -19,7 +19,7 @@ ID Matching

 Stanza Path Matching
 --------------------
-.. module:: sleekxmpp.xmlstream.matcher.stanzapath
+.. module:: slixmpp.xmlstream.matcher.stanzapath

 .. autoclass:: StanzaPath
    :members:
@@ -27,7 +27,7 @@ Stanza Path Matching

 XPath
 -----
-.. module:: sleekxmpp.xmlstream.matcher.xpath
+.. module:: slixmpp.xmlstream.matcher.xpath

 .. autoclass:: MatchXPath
    :members:
@@ -35,7 +35,7 @@ XPath

 XMLMask
 -------
-.. module:: sleekxmpp.xmlstream.matcher.xmlmask
+.. module:: slixmpp.xmlstream.matcher.xmlmask

 .. autoclass:: MatchXMLMask
    :members:
--- a/docs/api/xmlstream/scheduler.rst
+++ b/docs/api/xmlstream/scheduler.rst
@@ -2,7 +2,7 @@
 Scheduler
 =========

-.. module:: sleekxmpp.xmlstream.scheduler
+.. module:: slixmpp.xmlstream.scheduler

 .. autoclass:: Task
    :members:
--- a/docs/api/xmlstream/stanzabase.rst
+++ b/docs/api/xmlstream/stanzabase.rst
@@ -4,9 +4,9 @@
 Stanza Objects
 ==============

-.. module:: sleekxmpp.xmlstream.stanzabase
+.. module:: slixmpp.xmlstream.stanzabase

-The :mod:`~sleekmxpp.xmlstream.stanzabase` module provides a wrapper for the
+The :mod:`~slixmpp.xmlstream.stanzabase` module provides a wrapper for the
 standard :mod:`~xml.etree.ElementTree` module that makes working with XML
 less painful. Instead of having to manually move up and down an element
 tree and insert subelements and attributes, you can interact with an object
@@ -52,9 +52,9 @@ elements of the original XML chunk.
 .. seealso::
    :ref:`create-stanza-interfaces`.

-Because the :mod:`~sleekxmpp.xmlstream.stanzabase` module was developed
+Because the :mod:`~slixmpp.xmlstream.stanzabase` module was developed
 as part of an `XMPP <http://xmpp.org>`_ library, these chunks of XML are
-referred to as :term:`stanzas <stanza>`, and in SleekXMPP we refer to a
+referred to as :term:`stanzas <stanza>`, and in Slixmpp we refer to a
 subclass of :class:`ElementBase` which defines the interfaces needed for
 interacting with a given :term:`stanza` a :term:`stanza object`.

@@ -72,7 +72,7 @@ plugin stanza object. Here is an example:

    <iq type="result">
      <query xmlns="http://jabber.org/protocol/disco#info">
-        <identity category="client" type="bot" name="SleekXMPP Bot" />
+        <identity category="client" type="bot" name="Slixmpp Bot" />
      </query>
    </iq>

@@ -84,13 +84,13 @@ we can access the plugin as so::

    >>> iq['disco_info']
    '<query xmlns="http://jabber.org/protocol/disco#info">
-      <identity category="client" type="bot" name="SleekXMPP Bot" />
+      <identity category="client" type="bot" name="Slixmpp Bot" />
    </query>'

 We can then drill down through the plugin object's interfaces as desired::

    >>> iq['disco_info']['identities']
-    [('client', 'bot', 'SleekXMPP Bot')]
+    [('client', 'bot', 'Slixmpp Bot')]

 Plugins may also add new interfaces to the parent stanza object as if they
 had been defined by the parent directly, and can also override the behaviour
@@ -101,7 +101,7 @@ of an interface defined by the parent.
    - :ref:`create-stanza-plugins`
    - :ref:`create-extension-plugins`
    - :ref:`override-parent-interfaces`
-     
+

 Registering Stanza Plugins
 --------------------------
--- a/docs/api/xmlstream/tostring.rst
+++ b/docs/api/xmlstream/tostring.rst
@@ -1,18 +1,18 @@
-.. module:: sleekxmpp.xmlstream.tostring
+.. module:: slixmpp.xmlstream.tostring

 .. _tostring:

 XML Serialization
 =================

-Since the XML layer of SleekXMPP is based on :mod:`~xml.etree.ElementTree`,
+Since the XML layer of Slixmpp is based on :mod:`~xml.etree.ElementTree`,
 why not just use the built-in :func:`~xml.etree.ElementTree.tostring`
 method? The answer is that using that method produces ugly results when
 using namespaces. The :func:`tostring()` method used here intelligently
 hides namespaces when able and does not introduce excessive namespace
 prefixes::

-    >>> from sleekxmpp.xmlstream.tostring import tostring
+    >>> from slixmpp.xmlstream.tostring import tostring
    >>> from xml.etree import cElementTree as ET
    >>> xml = ET.fromstring('<foo xmlns="bar"><baz /></foo>')
    >>> ET.tostring(xml)
@@ -25,7 +25,7 @@ produce unexpected results depending on how the :func:`tostring()` method
 is invoked. For example, when sending XML on the wire, the main XMPP
 stanzas with their namespace of ``jabber:client`` will not include the
 namespace because that is already declared by the stream header. But, if
-you create a :class:`~sleekxmpp.stanza.message.Message` instance and dump
+you create a :class:`~slixmpp.stanza.message.Message` instance and dump
 it to the terminal, the ``jabber:client`` namespace will appear.

 .. autofunction:: tostring
--- a/docs/api/xmlstream/xmlstream.rst
+++ b/docs/api/xmlstream/xmlstream.rst
@@ -2,9 +2,7 @@
 XML Stream
 ==========

-.. module:: sleekxmpp.xmlstream.xmlstream
-
-.. autoexception:: RestartStream
+.. module:: slixmpp.xmlstream.xmlstream

 .. autoclass:: XMLStream
    :members:
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -1,9 +1,9 @@
 .. index:: XMLStream, BaseXMPP, ClientXMPP, ComponentXMPP

-SleekXMPP Architecture
+Slixmpp Architecture
 ======================

-The core of SleekXMPP is contained in four classes: ``XMLStream``,
+The core of Slixmpp is contained in four classes: ``XMLStream``,
 ``BaseXMPP``, ``ClientXMPP``, and ``ComponentXMPP``. Along side this
 stack is a library for working with XML objects that eliminates most
 of the tedium of creating/manipulating XML.
@@ -17,7 +17,7 @@ of the tedium of creating/manipulating XML.

 The Foundation: XMLStream
 -------------------------
-:class:`~sleekxmpp.xmlstream.xmlstream.XMLStream` is a mostly XMPP-agnostic
+:class:`~slixmpp.xmlstream.xmlstream.XMLStream` is a mostly XMPP-agnostic
 class whose purpose is to read and write from a bi-directional XML stream.
 It also allows for callback functions to execute when XML matching given
 patterns is received; these callbacks are also referred to as :term:`stream
@@ -26,7 +26,7 @@ which can be triggered either manually or on a timed schedule.

 The Main Threads
 ~~~~~~~~~~~~~~~~
-:class:`~sleekxmpp.xmlstream.xmlstream.XMLStream` instances run using at
+:class:`~slixmpp.xmlstream.xmlstream.XMLStream` instances run using at
 least three background threads: the send thread, the read thread, and the
 scheduler thread. The send thread is in charge of monitoring the send queue
 and writing text to the outgoing XML stream. The read thread pulls text off
@@ -34,7 +34,7 @@ of the incoming XML stream and stores the results in an event queue. The
 scheduler thread is used to emit events after a given period of time.

 Additionally, the main event processing loop may be executed in its
-own thread if SleekXMPP is being used in the background for another
+own thread if Slixmpp is being used in the background for another
 application.

 Short-lived threads may also be spawned as requested for threaded
@@ -61,10 +61,10 @@ when this bit of XML is received (with an assumed namespace of
   new object is determined using a map of namespaced element names to
   classes.

-   Our incoming XML is thus turned into a :class:`~sleekxmpp.stanza.Message`
+   Our incoming XML is thus turned into a :class:`~slixmpp.stanza.Message`
   :term:`stanza object` because the namespaced element name
   ``{jabber:client}message`` is associated with the class
-   :class:`~sleekxmpp.stanza.Message`.
+   :class:`~slixmpp.stanza.Message`.

 2. **Match stanza objects to callbacks.**

@@ -73,14 +73,14 @@ when this bit of XML is received (with an assumed namespace of
   :term:`stanza object` is paired with a reference to the handler and
   placed into the event queue.

-   Our :class:`~sleekxmpp.stanza.Message` object is thus paired with the message stanza handler
+   Our :class:`~slixmpp.stanza.Message` object is thus paired with the message stanza handler
   :meth:`BaseXMPP._handle_message` to create the tuple::

       ('stanza', stanza_obj, handler)

 3. **Process the event queue.**

-   The event queue is the heart of SleekXMPP. Nearly every action that
+   The event queue is the heart of Slixmpp. Nearly every action that
   takes place is first inserted into this queue, whether that be received
   stanzas, custom events, or scheduled events.

@@ -88,7 +88,7 @@ when this bit of XML is received (with an assumed namespace of
   callback, the callback function is executed with the stanza as its only
   parameter.

-   .. warning:: 
+   .. warning::
       The callback, aka :term:`stream handler`, is executed in the main event
       processing thread. If the handler blocks, event processing will also
       block.
@@ -97,7 +97,7 @@ when this bit of XML is received (with an assumed namespace of

   Since a :term:`stream handler` shouldn't block, if extensive processing
   for a stanza is required (such as needing to send and receive an
-   :class:`~sleekxmpp.stanza.Iq` stanza), then custom events must be used.
+   :class:`~slixmpp.stanza.Iq` stanza), then custom events must be used.
   These events are not explicitly tied to the incoming XML stream and may
   be raised at any time. Importantly, these events may be handled in their
   own thread.
@@ -108,10 +108,6 @@ when this bit of XML is received (with an assumed namespace of
   handlers <event handler>`. Each stanza/handler pair is then put into the
   event queue.

-   .. note::
-       It is possible to skip the event queue and process an event immediately
-       by using ``direct=True`` when raising the event.
-
   The code for :meth:`BaseXMPP._handle_message` follows this pattern, and
   raises a ``'message'`` event::

@@ -121,7 +117,7 @@ when this bit of XML is received (with an assumed namespace of
   paired with an :term:`event handler`::

       ('event', 'message', msg_copy1, custom_event_handler_1)
-       ('event', 'message', msg_copy2, custom_evetn_handler_2) 
+       ('event', 'message', msg_copy2, custom_evetn_handler_2)

 5. **Process Custom Events**

@@ -131,9 +127,9 @@ when this bit of XML is received (with an assumed namespace of
   will be spawned for it.

   .. note::
-       Events may be raised without needing :term:`stanza objects <stanza object>`. 
-       For example, you could use ``self.event('custom', {'a': 'b'})``. 
-       You don't even need any arguments: ``self.event('no_parameters')``. 
+       Events may be raised without needing :term:`stanza objects <stanza object>`.
+       For example, you could use ``self.event('custom', {'a': 'b'})``.
+       You don't even need any arguments: ``self.event('no_parameters')``.
       However, every event handler MUST accept at least one argument.

   Finally, after a long trek, our message is handed off to the user's
@@ -148,8 +144,8 @@ when this bit of XML is received (with an assumed namespace of

 Raising XMPP Awareness: BaseXMPP
 --------------------------------
-While :class:`~sleekxmpp.xmlstream.xmlstream.XMLStream` attempts to shy away
-from anything too XMPP specific, :class:`~sleekxmpp.basexmpp.BaseXMPP`'s
+While :class:`~slixmpp.xmlstream.xmlstream.XMLStream` attempts to shy away
+from anything too XMPP specific, :class:`~slixmpp.basexmpp.BaseXMPP`'s
 sole purpose is to provide foundational support for sending and receiving
 XMPP stanzas. This support includes registering the basic message,
 presence, and iq stanzas, methods for creating and sending stanzas, and
@@ -157,14 +153,14 @@ default handlers for incoming messages and keeping track of presence
 notifications.

 The plugin system for adding new XEP support is also maintained by
-:class:`~sleekxmpp.basexmpp.BaseXMPP`.
+:class:`~slixmpp.basexmpp.BaseXMPP`.

 .. index:: ClientXMPP, BaseXMPP

 ClientXMPP
 ----------
-:class:`~sleekxmpp.clientxmpp.ClientXMPP` extends
-:class:`~sleekxmpp.clientxmpp.BaseXMPP` with additional logic for connecting
+:class:`~slixmpp.clientxmpp.ClientXMPP` extends
+:class:`~slixmpp.clientxmpp.BaseXMPP` with additional logic for connecting
 to an XMPP server by performing DNS lookups. It also adds support for stream
 features such as STARTTLS and SASL.

@@ -172,6 +168,6 @@ features such as STARTTLS and SASL.

 ComponentXMPP
 -------------
-:class:`~sleekxmpp.componentxmpp.ComponentXMPP` is only a thin layer on top of
-:class:`~sleekxmpp.basexmpp.BaseXMPP` that implements the component handshake
+:class:`~slixmpp.componentxmpp.ComponentXMPP` is only a thin layer on top of
+:class:`~slixmpp.basexmpp.BaseXMPP` that implements the component handshake
 protocol.
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# SleekXMPP documentation build configuration file, created by
+# Slixmpp documentation build configuration file, created by
 # sphinx-quickstart on Tue Aug  9 22:27:06 2011.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -40,7 +40,7 @@ source_suffix = '.rst'
 master_doc = 'index'

 # General information about the project.
-project = u'SleekXMPP'
+project = u'Slixmpp'
 copyright = u'2011, Nathan Fritz, Lance Stout'

 # The version info for the project you're documenting, acts as replacement for
@@ -105,7 +105,7 @@ html_theme = 'haiku'

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = 'SleekXMPP'
+html_title = 'Slixmpp'

 # A shorter title for the navigation bar.  Default is the same as html_title.
 html_short_title = '%s Documentation' % release
@@ -168,7 +168,7 @@ html_additional_pages = {
 #html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = 'SleekXMPPdoc'
+htmlhelp_basename = 'Slixmppdoc'


 # -- Options for LaTeX output --------------------------------------------------
@@ -182,7 +182,7 @@ htmlhelp_basename = 'SleekXMPPdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'SleekXMPP.tex', u'SleekXMPP Documentation',
+  ('index', 'Slixmpp.tex', u'Slixmpp Documentation',
   u'Nathan Fritz, Lance Stout', 'manual'),
 ]

@@ -215,7 +215,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'sleekxmpp', u'SleekXMPP Documentation',
+    ('index', 'slixmpp', u'Slixmpp Documentation',
     [u'Nathan Fritz, Lance Stout'], 1)
 ]

--- a/docs/create_plugin.rst
+++ b/docs/create_plugin.rst
@@ -1,10 +1,10 @@
 .. _create-plugin:

-Creating a SleekXMPP Plugin
+Creating a Slixmpp Plugin
 ===========================

-One of the goals of SleekXMPP is to provide support for every draft or final
-XMPP extension (`XEP <http://xmpp.org/extensions/>`_). To do this, SleekXMPP has a
+One of the goals of Slixmpp is to provide support for every draft or final
+XMPP extension (`XEP <http://xmpp.org/extensions/>`_). To do this, Slixmpp has a
 plugin mechanism for adding the functionalities required by each XEP. But even
 though plugins were made to quickly implement and prototype the official XMPP
 extensions, there is no reason you can't create your own plugin to implement
@@ -14,11 +14,11 @@ This guide will help walk you through the steps to
 implement a rudimentary version of `XEP-0077 In-band
 Registration <http://xmpp.org/extensions/xep-0077.html>`_. In-band registration
 was implemented in example 14-6 (page 223) of `XMPP: The Definitive
-Guide <http://oreilly.com/catalog/9780596521271>`_ because there was no SleekXMPP
+Guide <http://oreilly.com/catalog/9780596521271>`_ because there was no Slixmpp
 plugin for XEP-0077 at the time of writing. We will partially fix that issue
 here by turning the example implementation from *XMPP: The Definitive Guide*
 into a plugin. Again, note that this will not a complete implementation, and a
-different, more robust, official plugin for XEP-0077 may be added to SleekXMPP
+different, more robust, official plugin for XEP-0077 may be added to Slixmpp
 in the future.

 .. note::
@@ -29,10 +29,10 @@ in the future.

 First Steps
 -----------
-Every plugin inherits from the class :mod:`base_plugin <sleekxmpp.plugins.base.base_plugin>`,
+Every plugin inherits from the class :mod:`BasePlugin <slixmpp.plugins.base.BasePlugin`,
 and must include a ``plugin_init`` method. While the
-plugins distributed with SleekXMPP must be placed in the plugins directory
-``sleekxmpp/plugins`` to be loaded, custom plugins may be loaded from any
+plugins distributed with Slixmpp must be placed in the plugins directory
+``slixmpp/plugins`` to be loaded, custom plugins may be loaded from any
 module. To do so, use the following form when registering the plugin:

 .. code-block:: python
@@ -40,9 +40,9 @@ module. To do so, use the following form when registering the plugin:
    self.register_plugin('myplugin', module=mod_containing_my_plugin)

 The plugin name must be the same as the plugin's class name.
- 
+
 Now, we can open our favorite text editors and create ``xep_0077.py`` in
-``SleekXMPP/sleekxmpp/plugins``. We want to do some basic house-keeping and
+``Slixmpp/slixmpp/plugins``. We want to do some basic house-keeping and
 declare the name and description of the XEP we are implementing. If you
 are creating your own custom plugin, you don't need to include the ``xep``
 attribute.
@@ -50,15 +50,15 @@ attribute.
 .. code-block:: python

    """
-    Creating a SleekXMPP Plugin
+    Creating a Slixmpp Plugin

    This is a minimal implementation of XEP-0077 to serve
-    as a tutorial for creating SleekXMPP plugins.
+    as a tutorial for creating Slixmpp plugins.
    """

-    from sleekxmpp.plugins.base import base_plugin
+    from slixmpp.plugins.base import BasePlugin

-    class xep_0077(base_plugin):
+    class xep_0077(BasePlugin):
        """
        XEP-0077 In-Band Registration
        """
@@ -68,7 +68,7 @@ attribute.
            self.xep = "0077"

 Now that we have a basic plugin, we need to edit
-``sleekxmpp/plugins/__init__.py`` to include our new plugin by adding
+``slixmpp/plugins/__init__.py`` to include our new plugin by adding
 ``'xep_0077'`` to the ``__all__`` declaration.

 Interacting with Other Plugins
@@ -81,20 +81,20 @@ call in a method named ``post_init`` which will be called once the plugin has
 been loaded; by doing so we advertise that we can do registrations only after we
 finish activating the plugin.

-The ``post_init`` method needs to call ``base_plugin.post_init(self)``
+The ``post_init`` method needs to call ``BasePlugin.post_init(self)``
 which will mark that ``post_init`` has been called for the plugin. Once the
-SleekXMPP object begins processing, ``post_init`` will be called on any plugins
+Slixmpp object begins processing, ``post_init`` will be called on any plugins
 that have not already run ``post_init``. This allows you to register plugins and
 their dependencies without needing to worry about the order in which you do so.

 **Note:** by adding this call we have introduced a dependency on the XEP-0030
-plugin. Be sure to register ``'xep_0030'`` as well as ``'xep_0077'``. SleekXMPP
+plugin. Be sure to register ``'xep_0030'`` as well as ``'xep_0077'``. Slixmpp
 does not automatically load plugin dependencies for you.

 .. code-block:: python

    def post_init(self):
-        base_plugin.post_init(self)
+        BasePlugin.post_init(self)
        self.xmpp['xep_0030'].add_feature("jabber:iq:register")

 Creating Custom Stanza Objects
@@ -141,7 +141,7 @@ behaviour:
    **Note:** The accessor methods currently use title case, and not camel case.
    Thus if you need to access an item named ``"methodName"`` you will need to
    use ``getMethodname``. This naming convention might change to full camel
-    case in a future version of SleekXMPP.
+    case in a future version of Slixmpp.

 * ``sub_interfaces``
    A subset of ``interfaces``, but these keys map to the text of any
@@ -156,8 +156,8 @@ behaviour:

 .. code-block:: python

-    from sleekxmpp.xmlstream import ElementBase, ET, JID, register_stanza_plugin
-    from sleekxmpp import Iq
+    from slixmpp.xmlstream import ElementBase, ET, JID, register_stanza_plugin
+    from slixmpp import Iq

    class Registration(ElementBase):
        namespace = 'jabber:iq:register'
@@ -209,7 +209,7 @@ registration to our ``plugin_init`` method.

 Also, we need to associate our ``Registration`` class with IQ stanzas;
 that requires the use of the ``register_stanza_plugin`` function (in
-``sleekxmpp.xmlstream.stanzabase``) which takes the class of a parent stanza
+``slixmpp.xmlstream.stanzabase``) which takes the class of a parent stanza
 type followed by the substanza type. In our case, the parent stanza is an IQ
 stanza, and the substanza is our registration query.

@@ -347,7 +347,7 @@ method ``setForm`` which will take the names of the fields we wish to include.
                # Add a blank field
                reg.addField(field)

-        iq.reply().setPayload(reg.xml)
+        iq.reply().set_payload(reg.xml)
        iq.send()

 Note how we are able to access our ``Registration`` stanza object with
@@ -421,7 +421,7 @@ to the IQ reply.
    ...

    def _sendError(self, iq, code, error_type, name, text=''):
-        iq.reply().setPayload(iq['register'].xml)
+        iq.reply().set_payload(iq['register'].xml)
        iq.error()
        iq['error']['code'] = code
        iq['error']['type'] = error_type
@@ -464,7 +464,7 @@ component examples below for how to respond to this event.
            if self.backend.register(iq['from'].bare, iq['register']):
                # Successful registration
                self.xmpp.event('registered_user', iq)
-                iq.reply().setPayload(iq['register'].xml)
+                iq.reply().set_payload(iq['register'].xml)
                iq.send()
            else:
                # Conflicting registration
@@ -484,15 +484,15 @@ and that we specified the form fields we wish to use with

 .. code-block:: python

-    import sleekxmpp.componentxmpp
+    import slixmpp.componentxmpp

-    class Example(sleekxmpp.componentxmpp.ComponentXMPP):
+    class Example(slixmpp.componentxmpp.ComponentXMPP):

        def __init__(self, jid, password):
-            sleekxmpp.componentxmpp.ComponentXMPP.__init__(self, jid, password, 'localhost', 8888)
+            slixmpp.componentxmpp.ComponentXMPP.__init__(self, jid, password, 'localhost', 8888)

-            self.registerPlugin('xep_0030')
-            self.registerPlugin('xep_0077')
+            self.register_plugin('xep_0030')
+            self.register_plugin('xep_0077')
            self.plugin['xep_0077'].setForm('username', 'password')

            self.add_event_handler("registered_user", self.reg)
@@ -500,11 +500,11 @@ and that we specified the form fields we wish to use with

        def reg(self, iq):
            msg = "Welcome! %s" % iq['register']['username']
-            self.sendMessage(iq['from'], msg, mfrom=self.fulljid)
+            self.send_message(iq['from'], msg, mfrom=self.fulljid)

        def unreg(self, iq):
            msg = "Bye! %s" % iq['register']['username']
-            self.sendMessage(iq['from'], msg, mfrom=self.fulljid)
+            self.send_message(iq['from'], msg, mfrom=self.fulljid)

 **Congratulations!** We now have a basic, functioning implementation of
 XEP-0077.
@@ -517,17 +517,17 @@ with some additional registration fields implemented.
 .. code-block:: python

    """
-    Creating a SleekXMPP Plugin
+    Creating a Slixmpp Plugin

    This is a minimal implementation of XEP-0077 to serve
-    as a tutorial for creating SleekXMPP plugins.
+    as a tutorial for creating Slixmpp plugins.
    """

-    from sleekxmpp.plugins.base import base_plugin
-    from sleekxmpp.xmlstream.handler.callback import Callback
-    from sleekxmpp.xmlstream.matcher.xpath import MatchXPath
-    from sleekxmpp.xmlstream import ElementBase, ET, JID, register_stanza_plugin
-    from sleekxmpp import Iq
+    from slixmpp.plugins.base import BasePlugin
+    from slixmpp.xmlstream.handler.callback import Callback
+    from slixmpp.xmlstream.matcher.xpath import MatchXPath
+    from slixmpp.xmlstream import ElementBase, ET, JID, register_stanza_plugin
+    from slixmpp import Iq
    import copy


@@ -535,9 +535,9 @@ with some additional registration fields implemented.
        namespace = 'jabber:iq:register'
        name = 'query'
        plugin_attrib = 'register'
-        interfaces = set(('username', 'password', 'email', 'nick', 'name', 
-                          'first', 'last', 'address', 'city', 'state', 'zip', 
-                          'phone', 'url', 'date', 'misc', 'text', 'key', 
+        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

@@ -589,7 +589,7 @@ with some additional registration fields implemented.
        def unregister(self, jid):
            del self.users[jid]

-    class xep_0077(base_plugin):
+    class xep_0077(BasePlugin):
        """
        XEP-0077 In-Band Registration
        """
@@ -608,7 +608,7 @@ with some additional registration fields implemented.
            register_stanza_plugin(Iq, Registration)

        def post_init(self):
-            base_plugin.post_init(self)
+            BasePlugin.post_init(self)
            self.xmpp['xep_0030'].add_feature("jabber:iq:register")

        def __handleRegistration(self, iq):
@@ -634,7 +634,7 @@ with some additional registration fields implemented.
                if self.backend.register(iq['from'].bare, iq['register']):
                    # Successful registration
                    self.xmpp.event('registered_user', iq)
-                    iq.reply().setPayload(iq['register'].xml)
+                    iq.reply().set_payload(iq['register'].xml)
                    iq.send()
                else:
                    # Conflicting registration
@@ -666,11 +666,11 @@ with some additional registration fields implemented.
                    # Add a blank field
                    reg.addField(field)

-            iq.reply().setPayload(reg.xml)
+            iq.reply().set_payload(reg.xml)
            iq.send()

        def _sendError(self, iq, code, error_type, name, text=''):
-            iq.reply().setPayload(iq['register'].xml)
+            iq.reply().set_payload(iq['register'].xml)
            iq.error()
            iq['error']['code'] = code
            iq['error']['type'] = error_type
--- a/docs/event_index.rst
+++ b/docs/event_index.rst
@@ -6,33 +6,33 @@ Event Index

    connected
        - **Data:** ``{}``
-        - **Source:** :py:class:`~sleekxmpp.xmlstream.XMLstream`
+        - **Source:** :py:class:`~slixmpp.xmlstream.XMLstream`

        Signal that a connection has been made with the XMPP server, but a session
        has not yet been established.

    connection_failed
        - **Data:** ``{}`` or ``Failure Stanza`` if available
-        - **Source:** :py:class:`~sleekxmpp.xmlstream.XMLstream`
+        - **Source:** :py:class:`~slixmpp.xmlstream.XMLstream`

        Signal that a connection can not be established after number of attempts.

    changed_status
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.roster.item.RosterItem`
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.roster.item.RosterItem`

        Triggered when a presence stanza is received from a JID with a show type
        different than the last presence stanza from the same JID.

    changed_subscription
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`

        Triggered whenever a presence stanza with a type of ``subscribe``,
        ``subscribed``, ``unsubscribe``, or ``unsubscribed`` is received.

        Note that if the values ``xmpp.auto_authorize`` and ``xmpp.auto_subscribe``
-        are set to ``True`` or ``False``, and not ``None``, then SleekXMPP will
+        are set to ``True`` or ``False``, and not ``None``, then Slixmpp will
        either accept or reject all subscription requests before your event handlers
        are called. Set these values to ``None`` if you wish to make more complex
        subscription decisions.
@@ -58,20 +58,20 @@ Event Index
        - **Source:**

    disco_info
-        - **Data:** :py:class:`~sleekxmpp.plugins.xep_0030.stanza.DiscoInfo`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0030.disco.xep_0030`
-        
+        - **Data:** :py:class:`~slixmpp.plugins.xep_0030.stanza.DiscoInfo`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0030.disco.xep_0030`
+
        Triggered whenever a ``disco#info`` result stanza is received.

    disco_items
-        - **Data:** :py:class:`~sleekxmpp.plugins.xep_0030.stanza.DiscoItems`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0030.disco.xep_0030`
-        
+        - **Data:** :py:class:`~slixmpp.plugins.xep_0030.stanza.DiscoItems`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0030.disco.xep_0030`
+
        Triggered whenever a ``disco#items`` result stanza is received.

    disconnected
        - **Data:** ``{}``
-        - **Source:** :py:class:`~sleekxmpp.xmlstream.XMLstream`
+        - **Source:** :py:class:`~slixmpp.xmlstream.XMLstream`

        Signal that the connection with the XMPP server has been lost.

@@ -81,33 +81,33 @@ Event Index

    failed_auth
        - **Data:** ``{}``
-        - **Source:** :py:class:`~sleekxmpp.ClientXMPP`, :py:class:`~sleekxmpp.plugins.xep_0078.xep_0078`
+        - **Source:** :py:class:`~slixmpp.ClientXMPP`, :py:class:`~slixmpp.plugins.xep_0078.xep_0078`

        Signal that the server has rejected the provided login credentials.

    gmail_notify
        - **Data:** ``{}``
-        - **Source:** :py:class:`~sleekxmpp.plugins.gmail_notify.gmail_notify`
-        
+        - **Source:** :py:class:`~slixmpp.plugins.gmail_notify.gmail_notify`
+
        Signal that there are unread emails for the Gmail account associated with the current XMPP account.

    gmail_messages
-        - **Data:** :py:class:`~sleekxmpp.Iq`
-        - **Source:** :py:class:`~sleekxmpp.plugins.gmail_notify.gmail_notify`
-        
+        - **Data:** :py:class:`~slixmpp.Iq`
+        - **Source:** :py:class:`~slixmpp.plugins.gmail_notify.gmail_notify`
+
        Signal that there are unread emails for the Gmail account associated with the current XMPP account.

    got_online
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.roster.item.RosterItem`
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.roster.item.RosterItem`

        If a presence stanza is received from a JID which was previously marked as
        offline, and the presence has a show type of '``chat``', '``dnd``', '``away``',
        or '``xa``', then this event is triggered as well.

    got_offline
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.roster.item.RosterItem`
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.roster.item.RosterItem`

        Signal that an unavailable presence stanza has been received from a JID.

@@ -116,25 +116,25 @@ Event Index
        - **Source:**

    groupchat_direct_invite
-        - **Data:** :py:class:`~sleekxmpp.Message`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0249.direct`
+        - **Data:** :py:class:`~slixmpp.Message`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0249.direct`

    groupchat_message
-        - **Data:** :py:class:`~sleekxmpp.Message`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0045.xep_0045`
-        
+        - **Data:** :py:class:`~slixmpp.Message`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0045.xep_0045`
+
        Triggered whenever a message is received from a multi-user chat room.

    groupchat_presence
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0045.xep_0045`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0045.xep_0045`
+
        Triggered whenever a presence stanza is received from a user in a multi-user chat room.

    groupchat_subject
-        - **Data:** :py:class:`~sleekxmpp.Message`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0045.xep_0045`
-        
+        - **Data:** :py:class:`~slixmpp.Message`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0045.xep_0045`
+
        Triggered whenever the subject of a multi-user chat room is changed, or announced when joining a room.

    killed
@@ -146,21 +146,21 @@ Event Index
        - **Source:**

    message
-        - **Data:** :py:class:`~sleekxmpp.Message`
-        - **Source:** :py:class:`BaseXMPP <sleekxmpp.BaseXMPP>`
-        
+        - **Data:** :py:class:`~slixmpp.Message`
+        - **Source:** :py:class:`BaseXMPP <slixmpp.BaseXMPP>`
+
        Makes the contents of message stanzas available whenever one is received. Be
        sure to check the message type in order to handle error messages.

    message_form
-        - **Data:** :py:class:`~sleekxmpp.plugins.xep_0004.Form`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0004.xep_0004`
+        - **Data:** :py:class:`~slixmpp.plugins.xep_0004.Form`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0004.xep_0004`

        Currently the same as :term:`message_xform`.

    message_xform
-        - **Data:** :py:class:`~sleekxmpp.plugins.xep_0004.Form`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0004.xep_0004`
+        - **Data:** :py:class:`~slixmpp.plugins.xep_0004.Form`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0004.xep_0004`

        Triggered whenever a data form is received inside a message.

@@ -181,74 +181,74 @@ Event Index
        - **Source:**

    presence_available
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``available``' is received.

    presence_error
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``error``' is received.

    presence_form
-        - **Data:** :py:class:`~sleekxmpp.plugins.xep_0004.Form`
-        - **Source:** :py:class:`~sleekxmpp.plugins.xep_0004.xep_0004`
-        
+        - **Data:** :py:class:`~slixmpp.plugins.xep_0004.Form`
+        - **Source:** :py:class:`~slixmpp.plugins.xep_0004.xep_0004`
+
        This event is present in the XEP-0004 plugin code, but is currently not used.

    presence_probe
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``probe``' is received.

    presence_subscribe
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``subscribe``' is received.

    presence_subscribed
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``subscribed``' is received.

    presence_unavailable
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``unavailable``' is received.

    presence_unsubscribe
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``unsubscribe``' is received.

    presence_unsubscribed
-        - **Data:** :py:class:`~sleekxmpp.Presence`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.Presence`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
+
        A presence stanza with a type of '``unsubscribed``' is received.

    roster_update
-        - **Data:** :py:class:`~sleekxmpp.stanza.Roster`
-        - **Source:** :py:class:`~sleekxmpp.ClientXMPP`
-        
+        - **Data:** :py:class:`~slixmpp.stanza.Roster`
+        - **Source:** :py:class:`~slixmpp.ClientXMPP`
+
        An IQ result containing roster entries is received.

    sent_presence
        - **Data:** ``{}``
-        - **Source:** :py:class:`~sleekxmpp.roster.multi.Roster`
-        
+        - **Source:** :py:class:`~slixmpp.roster.multi.Roster`
+
        Signal that an initial presence stanza has been written to the XML stream.

    session_end
        - **Data:** ``{}``
-        - **Source:** :py:class:`~sleekxmpp.xmlstream.XMLstream`
+        - **Source:** :py:class:`~slixmpp.xmlstream.XMLstream`

        Signal that a connection to the XMPP server has been lost and the current
        stream session has ended. Currently equivalent to :term:`disconnected`, but
@@ -260,16 +260,16 @@ Event Index

    session_start
        - **Data:** ``{}``
-        - **Source:** :py:class:`ClientXMPP <sleekxmpp.ClientXMPP>`,
-          :py:class:`ComponentXMPP <sleekxmpp.ComponentXMPP>`
-          :py:class:`XEP-0078 <sleekxmpp.plugins.xep_0078>`
+        - **Source:** :py:class:`ClientXMPP <slixmpp.ClientXMPP>`,
+          :py:class:`ComponentXMPP <slixmpp.ComponentXMPP>`
+          :py:class:`XEP-0078 <slixmpp.plugins.xep_0078>`

        Signal that a connection to the XMPP server has been made and a session has been established.

    socket_error
        - **Data:** ``Socket`` exception object
-        - **Source:** :py:class:`~sleekxmpp.xmlstream.XMLstream`
+        - **Source:** :py:class:`~slixmpp.xmlstream.XMLstream`

    stream_error
-        - **Data:** :py:class:`~sleekxmpp.stanza.StreamError`
-        - **Source:** :py:class:`~sleekxmpp.BaseXMPP`
+        - **Data:** :py:class:`~slixmpp.stanza.StreamError`
+        - **Source:** :py:class:`~slixmpp.BaseXMPP`
--- a/docs/getting_started/component.rst
+++ b/docs/getting_started/component.rst
@@ -5,24 +5,24 @@ Create and Run a Server Component
 =================================

 .. note::
-    
+
    If you have any issues working through this quickstart guide
    or the other tutorials here, please either send a message to the
-    `mailing list <http://groups.google.com/group/sleekxmpp-discussion>`_
+    `mailing list <http://groups.google.com/group/slixmpp-discussion>`_
    or join the chat room at `sleek@conference.jabber.org
    <xmpp:sleek@conference.jabber.org?join>`_.

-If you have not yet installed SleekXMPP, do so now by either checking out a version
-from `Github <http://github.com/fritzy/SleekXMPP>`_, or installing it using ``pip``
+If you have not yet installed Slixmpp, do so now by either checking out a version
+from `Github <http://github.com/fritzy/Slixmpp>`_, or installing it using ``pip``
 or ``easy_install``.

 .. code-block:: sh

-    pip install sleekxmpp  # Or: easy_install sleekxmpp
+    pip install slixmpp  # Or: easy_install slixmpp


-Many XMPP applications eventually graduate to requiring to run as a server 
-component in order to meet scalability requirements. To demonstrate how to 
+Many XMPP applications eventually graduate to requiring to run as a server
+component in order to meet scalability requirements. To demonstrate how to
 turn an XMPP client bot into a component, we'll turn the echobot example
 (:ref:`echobot`) into a component version.

@@ -30,7 +30,7 @@ The first difference is that we will add an additional import statement:

 .. code-block:: python

-    from sleekxmpp.componentxmpp import ComponentXMPP
+    from slixmpp.componentxmpp import ComponentXMPP

 Likewise, we will change the bot's class definition to match:

@@ -48,7 +48,7 @@ a MUC component, the following could be used:

 .. code-block:: python

-    muc = ComponentXMPP('muc.sleekxmpp.com', '******', 'sleekxmpp.com', 5555)
+    muc = ComponentXMPP('muc.slixmpp.com', '******', 'slixmpp.com', 5555)

 .. note::

@@ -62,10 +62,10 @@ with presence.
 The other, main difference with components is that the
 ``'from'`` value for every stanza must be explicitly set, since
 components may send stanzas from multiple JIDs. To do so,
-the :meth:`~sleekxmpp.basexmpp.BaseXMPP.send_message()` and
-:meth:`~sleekxmpp.basexmpp.BaseXMPP.send_presence()` accept the parameters
+the :meth:`~slixmpp.basexmpp.BaseXMPP.send_message()` and
+:meth:`~slixmpp.basexmpp.BaseXMPP.send_presence()` accept the parameters
 ``mfrom`` and ``pfrom``, respectively. For any method that uses
-:class:`~sleekxmpp.stanza.iq.Iq` stanzas, ``ifrom`` may be used.
+:class:`~slixmpp.stanza.iq.Iq` stanzas, ``ifrom`` may be used.


 Final Product
--- a/docs/getting_started/echobot.rst
+++ b/docs/getting_started/echobot.rst
@@ -1,24 +1,24 @@
 .. _echobot:

 ===============================
-SleekXMPP Quickstart - Echo Bot
+Slixmpp Quickstart - Echo Bot
 ===============================

 .. note::
-    
+
    If you have any issues working through this quickstart guide
    or the other tutorials here, please either send a message to the
-    `mailing list <http://groups.google.com/group/sleekxmpp-discussion>`_
+    `mailing list <http://groups.google.com/group/slixmpp-discussion>`_
    or join the chat room at `sleek@conference.jabber.org
    <xmpp:sleek@conference.jabber.org?join>`_.

-If you have not yet installed SleekXMPP, do so now by either checking out a version
-from `Github <http://github.com/fritzy/SleekXMPP>`_, or installing it using ``pip``
+If you have not yet installed Slixmpp, do so now by either checking out a version
+from `Github <http://github.com/fritzy/Slixmpp>`_, or installing it using ``pip``
 or ``easy_install``.

 .. code-block:: sh

-    pip install sleekxmpp  # Or: easy_install sleekxmpp
+    pip install slixmpp  # Or: easy_install slixmpp


 As a basic starting project, we will create an echo bot which will reply to any
@@ -48,7 +48,7 @@ To get started, here is a brief outline of the structure that the final project
    import getpass
    from optparse import OptionParser

-    import sleekxmpp
+    import slixmpp

    '''Here we will create out echo bot class'''

@@ -61,7 +61,7 @@ To get started, here is a brief outline of the structure that the final project

 Default Encoding
 ----------------
-XMPP requires support for UTF-8 and so SleekXMPP must use UTF-8 as well. In
+XMPP requires support for UTF-8 and so Slixmpp must use UTF-8 as well. In
 Python3 this is simple because Unicode is the default string type. For Python2.6+
 the situation is not as easy because standard strings are simply byte arrays and
 use ASCII. We can get Python to use UTF-8 as the default encoding by including:
@@ -69,13 +69,13 @@ use ASCII. We can get Python to use UTF-8 as the default encoding by including:
 .. code-block:: python

    if sys.version_info < (3, 0):
-        from sleekxmpp.util.misc_ops import setdefaultencoding
+        from slixmpp.util.misc_ops import setdefaultencoding
        setdefaultencoding('utf8')

 .. warning::

-    Until we are able to ensure that SleekXMPP will always use Unicode in Python2.6+, this
-    may cause issues embedding SleekXMPP into other applications which assume ASCII encoding.
+    Until we are able to ensure that Slixmpp will always use Unicode in Python2.6+, this
+    may cause issues embedding Slixmpp into other applications which assume ASCII encoding.

 Creating the EchoBot Class
 --------------------------
@@ -85,15 +85,15 @@ clients. Since our echo bot will only be responding to a few people, and won't n
 to remember thousands of users, we will use a client connection. A client connection
 is the same type that you use with your standard IM client such as Pidgin or Psi.

-SleekXMPP comes with a :class:`ClientXMPP <sleekxmpp.clientxmpp.ClientXMPP>` class
-which we can extend to add our message echoing feature. :class:`ClientXMPP <sleekxmpp.clientxmpp.ClientXMPP>`
+Slixmpp comes with a :class:`ClientXMPP <slixmpp.clientxmpp.ClientXMPP>` class
+which we can extend to add our message echoing feature. :class:`ClientXMPP <slixmpp.clientxmpp.ClientXMPP>`
 requires the parameters ``jid`` and ``password``, so we will let our ``EchoBot`` class accept those
 as well.

 .. code-block:: python

-    class EchoBot(sleekxmpp.ClientXMPP):
-        
+    class EchoBot(slixmpp.ClientXMPP):
+
        def __init__(self, jid, password):
            super(EchoBot, self).__init__(jid, password)

@@ -102,7 +102,7 @@ Handling Session Start
 The XMPP spec requires clients to broadcast its presence and retrieve its roster (buddy list) once
 it connects and establishes a session with the XMPP server. Until these two tasks are completed,
 some servers may not deliver or send messages or presence notifications to the client. So we now
-need to be sure that we retrieve our roster and send an initial presence once the session has 
+need to be sure that we retrieve our roster and send an initial presence once the session has
 started. To do that, we will register an event handler for the :term:`session_start` event.

 .. code-block:: python
@@ -132,8 +132,8 @@ Our event handler, like every event handler, accepts a single parameter which ty
 that was received that caused the event. In this case, ``event`` will just be an empty dictionary since
 there is no associated data.

-Our first task of sending an initial presence is done using :meth:`send_presence <sleekxmpp.basexmpp.BaseXMPP.send_presence>`.
-Calling :meth:`send_presence <sleekxmpp.basexmpp.BaseXMPP.send_presence>` without any arguments will send the simplest
+Our first task of sending an initial presence is done using :meth:`send_presence <slixmpp.basexmpp.BaseXMPP.send_presence>`.
+Calling :meth:`send_presence <slixmpp.basexmpp.BaseXMPP.send_presence>` without any arguments will send the simplest
 stanza allowed in XMPP:

 .. code-block:: xml
@@ -141,17 +141,17 @@ stanza allowed in XMPP:
    <presence />


-The second requirement is fulfilled using :meth:`get_roster <sleekxmpp.clientxmpp.ClientXMPP.get_roster>`, which
+The second requirement is fulfilled using :meth:`get_roster <slixmpp.clientxmpp.ClientXMPP.get_roster>`, which
 will send an IQ stanza requesting the roster to the server and then wait for the response. You may be wondering
-what :meth:`get_roster <sleekxmpp.clientxmpp.ClientXMPP.get_roster>` returns since we are not saving any return
+what :meth:`get_roster <slixmpp.clientxmpp.ClientXMPP.get_roster>` returns since we are not saving any return
 value. The roster data is saved by an internal handler to ``self.roster``, and in the case of a :class:`ClientXMPP
-<sleekxmpp.clientxmpp.ClientXMPP>` instance to ``self.client_roster``. (The difference between ``self.roster`` and
+<slixmpp.clientxmpp.ClientXMPP>` instance to ``self.client_roster``. (The difference between ``self.roster`` and
 ``self.client_roster`` is that ``self.roster`` supports storing roster information for multiple JIDs, which is useful
 for components, whereas ``self.client_roster`` stores roster data for just the client's JID.)

 It is possible for a timeout to occur while waiting for the server to respond, which can happen if the
 network is excessively slow or the server is no longer responding. In that case, an :class:`IQTimeout
-<sleekxmpp.exceptions.IQTimeout>` is raised. Similarly, an :class:`IQError <sleekxmpp.exceptions.IQError>` exception can
+<slixmpp.exceptions.IQTimeout>` is raised. Similarly, an :class:`IQError <slixmpp.exceptions.IQError>` exception can
 be raised if the request contained bad data or requested the roster for the wrong user. In either case, you can wrap the
 ``get_roster()`` call in a ``try``/``except`` block to retry the roster retrieval process.

@@ -198,10 +198,10 @@ or ``chat``. (Other potential types are ``error``, ``headline``, and ``groupchat

 Let's take a closer look at the ``.reply()`` method used above. For message stanzas,
 ``.reply()`` accepts the parameter ``body`` (also as the first positional argument),
-which is then used as the value of the ``<body />`` element of the message. 
+which is then used as the value of the ``<body />`` element of the message.
 Setting the appropriate ``to`` JID is also handled by ``.reply()``.

-Another way to have sent the reply message would be to use :meth:`send_message <sleekxmpp.basexmpp.BaseXMPP.send_message>`,
+Another way to have sent the reply message would be to use :meth:`send_message <slixmpp.basexmpp.BaseXMPP.send_message>`,
 which is a convenience method for generating and sending a message based on the values passed to it. If we were to use
 this method, the above code would look as so:

@@ -229,20 +229,20 @@ Whichever method you choose to use, the results in action will look like this:
    XMPP does not require stanzas sent by a client to include a ``from`` attribute, and
    leaves that responsibility to the XMPP server. However, if a sent stanza does
    include a ``from`` attribute, it must match the full JID of the client or some
-    servers will reject it. SleekXMPP thus leaves out the ``from`` attribute when replying
+    servers will reject it. Slixmpp thus leaves out the ``from`` attribute when replying
    using a client connection.

 Command Line Arguments and Logging
 ----------------------------------

-While this isn't part of SleekXMPP itself, we do want our echo bot program to be able
+While this isn't part of Slixmpp itself, we do want our echo bot program to be able
 to accept a JID and password from the command line instead of hard coding them. We will
 use the ``optparse`` module for this, though there are several alternative methods, including
 the newer ``argparse`` module.

 We want to accept three parameters: the JID for the echo bot, its password, and a flag for
 displaying the debugging logs. We also want these to be optional parameters, since passing
-a password directly through the command line can be a security risk. 
+a password directly through the command line can be a security risk.

 .. code-block:: python

@@ -303,21 +303,21 @@ the ``EchoBot.__init__`` method instead.

 .. note::

-    If you are using the OpenFire server, you will need to include an additional 
+    If you are using the OpenFire server, you will need to include an additional
    configuration step. OpenFire supports a different version of SSL than what
-    most servers and SleekXMPP support.
+    most servers and Slixmpp support.

    .. code-block:: python
-    
+
        import ssl
        xmpp.ssl_version = ssl.PROTOCOL_SSLv3

 Now we're ready to connect and begin echoing messages. If you have the package
-``dnspython`` installed, then the :meth:`sleekxmpp.clientxmpp.ClientXMPP` method
+``dnspython`` installed, then the :meth:`slixmpp.clientxmpp.ClientXMPP` method
 will perform a DNS query to find the appropriate server to connect to for the
-given JID. If you do not have ``dnspython``, then SleekXMPP will attempt to 
+given JID. If you do not have ``dnspython``, then Slixmpp will attempt to
 connect to the hostname used by the JID, unless an address tuple is supplied
-to :meth:`sleekxmpp.clientxmpp.ClientXMPP`. 
+to :meth:`slixmpp.clientxmpp.ClientXMPP`.

 .. code-block:: python

@@ -346,19 +346,19 @@ to :meth:`sleekxmpp.clientxmpp.ClientXMPP`.
            else:
                print('Unable to connect')

-To begin responding to messages, you'll see we called :meth:`sleekxmpp.basexmpp.BaseXMPP.process`
+To begin responding to messages, you'll see we called :meth:`slixmpp.basexmpp.BaseXMPP.process`
 which will start the event handling, send queue, and XML reader threads. It will also call
-the :meth:`sleekxmpp.plugins.base.base_plugin.post_init` method on all registered plugins. By
-passing ``block=True`` to :meth:`sleekxmpp.basexmpp.BaseXMPP.process` we are running the 
-main processing loop in the main thread of execution. The :meth:`sleekxmpp.basexmpp.BaseXMPP.process`
-call will not return until after SleekXMPP disconnects. If you need to run the client in the background
+the :meth:`slixmpp.plugins.base.BasePlugin.post_init` method on all registered plugins. By
+passing ``block=True`` to :meth:`slixmpp.basexmpp.BaseXMPP.process` we are running the
+main processing loop in the main thread of execution. The :meth:`slixmpp.basexmpp.BaseXMPP.process`
+call will not return until after Slixmpp disconnects. If you need to run the client in the background
 for another program, use ``block=False`` to spawn the processing loop in its own thread.

-.. note:: 
+.. note::

-    Before 1.0, controlling the blocking behaviour of :meth:`sleekxmpp.basexmpp.BaseXMPP.process` was
+    Before 1.0, controlling the blocking behaviour of :meth:`slixmpp.basexmpp.BaseXMPP.process` was
    done via the ``threaded`` argument. This arrangement was a source of confusion because some users
-    interpreted that as controlling whether or not SleekXMPP used threads at all, instead of how
+    interpreted that as controlling whether or not Slixmpp used threads at all, instead of how
    the processing loop itself was spawned.

    The statements ``xmpp.process(threaded=False)`` and ``xmpp.process(block=True)`` are equivalent.
@@ -370,7 +370,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 SleekXMPP `examples directory <http://github.com/fritzy/SleekXMPP/tree/master/examples>`_.
+can also be found in the Slixmpp `examples directory <http://github.com/fritzy/Slixmpp/tree/master/examples>`_.

 .. compound::

--- a/docs/getting_started/iq.rst
+++ b/docs/getting_started/iq.rst
@@ -1,17 +1,17 @@
 Send/Receive IQ Stanzas
 =======================

-Unlike :class:`~sleekxmpp.stanza.message.Message` and
-:class:`~sleekxmpp.stanza.presence.Presence` stanzas which only use
-text data for basic usage, :class:`~sleekxmpp.stanza.iq.Iq` stanzas
+Unlike :class:`~slixmpp.stanza.message.Message` and
+:class:`~slixmpp.stanza.presence.Presence` stanzas which only use
+text data for basic usage, :class:`~slixmpp.stanza.iq.Iq` stanzas
 require using XML payloads, and generally entail creating a new
-SleekXMPP plugin to provide the necessary convenience methods to
+Slixmpp plugin to provide the necessary convenience methods to
 make working with them easier.

 Basic Use
 ---------

-XMPP's use of :class:`~sleekxmpp.stanza.iq.Iq` stanzas is built around
+XMPP's use of :class:`~slixmpp.stanza.iq.Iq` stanzas is built around
 namespaced ``<query />`` elements. For clients, just sending the
 empty ``<query />`` element will suffice for retrieving information. For
 example, a very basic implementation of service discovery would just
@@ -26,18 +26,18 @@ need to be able to send:
 Creating Iq Stanzas
 ~~~~~~~~~~~~~~~~~~~

-SleekXMPP provides built-in support for creating basic :class:`~sleekxmpp.stanza.iq.Iq`
+Slixmpp provides built-in support for creating basic :class:`~slixmpp.stanza.iq.Iq`
 stanzas this way. The relevant methods are:

-* :meth:`~sleekxmpp.basexmpp.BaseXMPP.make_iq`
-* :meth:`~sleekxmpp.basexmpp.BaseXMPP.make_iq_get`
-* :meth:`~sleekxmpp.basexmpp.BaseXMPP.make_iq_set`
-* :meth:`~sleekxmpp.basexmpp.BaseXMPP.make_iq_result`
-* :meth:`~sleekxmpp.basexmpp.BaseXMPP.make_iq_error`
-* :meth:`~sleekxmpp.basexmpp.BaseXMPP.make_iq_query`
+* :meth:`~slixmpp.basexmpp.BaseXMPP.make_iq`
+* :meth:`~slixmpp.basexmpp.BaseXMPP.make_iq_get`
+* :meth:`~slixmpp.basexmpp.BaseXMPP.make_iq_set`
+* :meth:`~slixmpp.basexmpp.BaseXMPP.make_iq_result`
+* :meth:`~slixmpp.basexmpp.BaseXMPP.make_iq_error`
+* :meth:`~slixmpp.basexmpp.BaseXMPP.make_iq_query`

-These methods all follow the same pattern: create or modify an existing 
-:class:`~sleekxmpp.stanza.iq.Iq` stanza, set the ``'type'`` value based
+These methods all follow the same pattern: create or modify an existing
+:class:`~slixmpp.stanza.iq.Iq` stanza, set the ``'type'`` value based
 on the method name, and finally add a ``<query />`` element with the given
 namespace. For example, to produce the query above, you would use:

@@ -50,14 +50,14 @@ namespace. For example, to produce the query above, you would use:
 Sending Iq Stanzas
 ~~~~~~~~~~~~~~~~~~

-Once an :class:`~sleekxmpp.stanza.iq.Iq` stanza is created, sending it
-over the wire is done using its :meth:`~sleekxmpp.stanza.iq.Iq.send()`
+Once an :class:`~slixmpp.stanza.iq.Iq` stanza is created, sending it
+over the wire is done using its :meth:`~slixmpp.stanza.iq.Iq.send()`
 method, like any other stanza object. However, there are a few extra
 options to control how to wait for the query's response.

 These options are:

-* ``block``: The default behaviour is that :meth:`~sleekxmpp.stanza.iq.Iq.send()`
+* ``block``: The default behaviour is that :meth:`~slixmpp.stanza.iq.Iq.send()`
  will block until a response is received and the response stanza will be the
  return value. Setting ``block`` to ``False`` will cause the call to return
  immediately. In which case, you will need to arrange some way to capture
@@ -74,7 +74,7 @@ These options are:
  To change the timeout for a single call, the ``timeout`` parameter works:

    .. code-block:: python
-        
+
        iq.send(timeout=60)

 * ``callback``: When not using a blocking call, using the ``callback``
@@ -85,16 +85,16 @@ These options are:

    .. code-block:: python

-       cb_name = iq.send(callback=self.a_callback) 
+       cb_name = iq.send(callback=self.a_callback)

       # ... later if we need to cancel
       self.remove_handler(cb_name)

-Properly working with :class:`~sleekxmpp.stanza.iq.Iq` stanzas requires
+Properly working with :class:`~slixmpp.stanza.iq.Iq` stanzas requires
 handling the intended, normal flow, error responses, and timed out
 requests. To make this easier, two exceptions may be thrown by
-:meth:`~sleekxmpp.stanza.iq.Iq.send()`: :exc:`~sleekxmpp.exceptions.IqError`
-and :exc:`~sleekxmpp.exceptions.IqTimeout`. These exceptions only
+:meth:`~slixmpp.stanza.iq.Iq.send()`: :exc:`~slixmpp.exceptions.IqError`
+and :exc:`~slixmpp.exceptions.IqTimeout`. These exceptions only
 apply to the default, blocking calls.

 .. code-block:: python
@@ -110,7 +110,7 @@ apply to the default, blocking calls.
        pass

 If you do not care to distinguish between errors and timeouts, then you
-can combine both cases with a generic :exc:`~sleekxmpp.exceptions.XMPPError`
+can combine both cases with a generic :exc:`~slixmpp.exceptions.XMPPError`
 exception:

 .. code-block:: python
@@ -124,24 +124,24 @@ exception:
 Advanced Use
 ------------

-Going beyond the basics provided by SleekXMPP requires building at least a
-rudimentary SleekXMPP plugin to create a :term:`stanza object` for
-interfacting with the :class:`~sleekxmpp.stanza.iq.Iq` payload.
+Going beyond the basics provided by Slixmpp requires building at least a
+rudimentary Slixmpp plugin to create a :term:`stanza object` for
+interfacting with the :class:`~slixmpp.stanza.iq.Iq` payload.

 .. seealso::

    * :ref:`create-plugin`
    * :ref:`work-with-stanzas`
    * :ref:`using-handlers-matchers`
-    

-The typical way to respond to :class:`~sleekxmpp.stanza.iq.Iq` requests is
+
+The typical way to respond to :class:`~slixmpp.stanza.iq.Iq` requests is
 to register stream handlers. As an example, suppose we create a stanza class
 named ``CustomXEP`` which uses the XML element ``<query xmlns="custom-xep" />``,
-and has a :attr:`~sleekxmpp.xmlstream.stanzabase.ElementBase.plugin_attrib` value
+and has a :attr:`~slixmpp.xmlstream.stanzabase.ElementBase.plugin_attrib` value
 of ``custom_xep``.

-There are two types of incoming :class:`~sleekxmpp.stanza.iq.Iq` requests:
+There are two types of incoming :class:`~slixmpp.stanza.iq.Iq` requests:
 ``get`` and ``set``. You can register a handler that will accept both and then
 filter by type as needed, as so:

@@ -167,7 +167,7 @@ filter by type as needed, as so:

 If you want to filter out query types beforehand, you can adjust the matching
 filter by using ``@type=get`` or ``@type=set`` if you are using the recommended
-:class:`~sleekxmpp.xmlstream.matcher.stanzapath.StanzaPath` matcher.
+:class:`~slixmpp.xmlstream.matcher.stanzapath.StanzaPath` matcher.

 .. code-block:: python

--- a/docs/getting_started/muc.rst
+++ b/docs/getting_started/muc.rst
@@ -8,20 +8,20 @@ Mulit-User Chat (MUC) Bot

    If you have any issues working through this quickstart guide
    or the other tutorials here, please either send a message to the
-    `mailing list <http://groups.google.com/group/sleekxmpp-discussion>`_
+    `mailing list <http://groups.google.com/group/slixmpp-discussion>`_
    or join the chat room at `sleek@conference.jabber.org
    <xmpp:sleek@conference.jabber.org?join>`_.

-If you have not yet installed SleekXMPP, do so now by either checking out a version
-from `Github <http://github.com/fritzy/SleekXMPP>`_, or installing it using ``pip``
+If you have not yet installed Slixmpp, do so now by either checking out a version
+from `Github <http://github.com/fritzy/Slixmpp>`_, or installing it using ``pip``
 or ``easy_install``.

 .. code-block:: sh

-    pip install sleekxmpp  # Or: easy_install sleekxmpp
+    pip install slixmpp  # Or: easy_install slixmpp


-Now that you've got the basic gist of using SleekXMPP by following the
+Now that you've got the basic gist of using Slixmpp by following the
 echobot example (:ref:`echobot`), we can use one of the bundled plugins
 to create a very popular XMPP starter project: a `Multi-User Chat`_
 (MUC) bot. Our bot will login to an XMPP server, join an MUC chat room
@@ -36,7 +36,7 @@ Joining The Room

 As usual, our code will be based on the pattern explained in :ref:`echobot`.
 To start, we create an ``MUCBot`` class based on
-:class:`ClientXMPP <sleekxmpp.clientxmpp.ClientXMPP>` and which accepts
+:class:`ClientXMPP <slixmpp.clientxmpp.ClientXMPP>` and which accepts
 parameters for the JID of the MUC room to join, and the nick that the
 bot will use inside the chat room.  We also register an
 :term:`event handler` for the :term:`session_start` event.
@@ -44,12 +44,12 @@ bot will use inside the chat room.  We also register an

 .. code-block:: python

-    import sleekxmpp
+    import slixmpp

-    class MUCBot(sleekxmpp.ClientXMPP):
+    class MUCBot(slixmpp.ClientXMPP):

        def __init__(self, jid, password, room, nick):
-            sleekxmpp.ClientXMPP.__init__(self, jid, password)
+            slixmpp.ClientXMPP.__init__(self, jid, password)

            self.room = room
            self.nick = nick
@@ -81,7 +81,7 @@ the roster. Next, we want to join the group chat, so we call the

 .. note::

-    The :attr:`plugin <sleekxmpp.basexmpp.BaseXMPP.plugin>` attribute is
+    The :attr:`plugin <slixmpp.basexmpp.BaseXMPP.plugin>` attribute is
    dictionary that maps to instances of plugins that we have previously
    registered, by their names.

@@ -115,7 +115,7 @@ event inside the bot's ``__init__`` function.
 .. code-block:: python

    def __init__(self, jid, password, room, nick):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.room = room
        self.nick = nick
@@ -159,7 +159,7 @@ event so it's a good idea to register an event handler for it.
 .. code-block:: python

    def __init__(self, jid, password, room, nick):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.room = room
        self.nick = nick
--- a/docs/getting_started/proxy.rst
+++ b/docs/getting_started/proxy.rst
@@ -5,19 +5,19 @@ Enable HTTP Proxy Support
 =========================

 .. note::
-    
+
    If you have any issues working through this quickstart guide
    or the other tutorials here, please either send a message to the
-    `mailing list <http://groups.google.com/group/sleekxmpp-discussion>`_
+    `mailing list <http://groups.google.com/group/slixmpp-discussion>`_
    or join the chat room at `sleek@conference.jabber.org
    <xmpp:sleek@conference.jabber.org?join>`_.

 In some instances, you may wish to route XMPP traffic through
 an HTTP proxy, probably to get around restrictive firewalls.
-SleekXMPP provides support for basic HTTP proxying with DIGEST
+Slixmpp provides support for basic HTTP proxying with DIGEST
 authentication.

-Enabling proxy support is done in two steps. The first is to instruct SleekXMPP
+Enabling proxy support is done in two steps. The first is to instruct Slixmpp
 to use a proxy, and the second is to configure the proxy details:

 .. code-block:: python
--- a/docs/getting_started/sendlogout.rst
+++ b/docs/getting_started/sendlogout.rst
@@ -2,29 +2,29 @@ Sign in, Send a Message, and Disconnect
 =======================================

 .. note::
-    
+
    If you have any issues working through this quickstart guide
    or the other tutorials here, please either send a message to the
-    `mailing list <http://groups.google.com/group/sleekxmpp-discussion>`_
+    `mailing list <http://groups.google.com/group/slixmpp-discussion>`_
    or join the chat room at `sleek@conference.jabber.org
    <xmpp:sleek@conference.jabber.org?join>`_.

-A common use case for SleekXMPP is to send one-off messages from
-time to time. For example, one use case could be sending out a notice when 
+A common use case for Slixmpp is to send one-off messages from
+time to time. For example, one use case could be sending out a notice when
 a shell script finishes a task.

 We will create our one-shot bot based on the pattern explained in :ref:`echobot`. To
-start, we create a client class based on :class:`ClientXMPP <sleekxmpp.clientxmpp.ClientXMPP>` and
+start, we create a client class based on :class:`ClientXMPP <slixmpp.clientxmpp.ClientXMPP>` and
 register a handler for the :term:`session_start` event. We will also accept parameters
 for the JID that will receive our message, and the string content of the message.

 .. code-block:: python

-    import sleekxmpp
+    import slixmpp


-    class SendMsgBot(sleekxmpp.ClientXMPP):
-        
+    class SendMsgBot(slixmpp.ClientXMPP):
+
        def __init__(self, jid, password, recipient, msg):
            super(SendMsgBot, self).__init__(jid, password)

@@ -38,7 +38,7 @@ for the JID that will receive our message, and the string content of the message
            self.get_roster()

 Note that as in :ref:`echobot`, we need to include send an initial presence and request
-the roster. Next, we want to send our message, and to do that we will use :meth:`send_message <sleekxmpp.basexmpp.BaseXMPP.send_message>`.
+the roster. Next, we want to send our message, and to do that we will use :meth:`send_message <slixmpp.basexmpp.BaseXMPP.send_message>`.

 .. code-block:: python

@@ -48,12 +48,12 @@ the roster. Next, we want to send our message, and to do that we will use :meth:

        self.send_message(mto=self.recipient, mbody=self.msg)

-Finally, we need to disconnect the client using :meth:`disconnect <sleekxmpp.xmlstream.XMLStream.disconnect>`.
+Finally, we need to disconnect the client using :meth:`disconnect <slixmpp.xmlstream.XMLStream.disconnect>`.
 Now, sent stanzas are placed in a queue to pass them to the send thread. If we were to call
-:meth:`disconnect <sleekxmpp.xmlstream.XMLStream.disconnect>` without any parameters, then it is possible
+:meth:`disconnect <slixmpp.xmlstream.XMLStream.disconnect>` without any parameters, then it is possible
 for the client to disconnect before the send queue is processed and the message is actually
-sent on the wire. To ensure that our message is processed, we use 
-:meth:`disconnect(wait=True) <sleekxmpp.xmlstream.XMLStream.disconnect>`.
+sent on the wire. To ensure that our message is processed, we use
+:meth:`disconnect(wait=True) <slixmpp.xmlstream.XMLStream.disconnect>`.

 .. code-block:: python

@@ -68,7 +68,7 @@ sent on the wire. To ensure that our message is processed, we use
 .. warning::

    If you happen to be adding stanzas to the send queue faster than the send thread
-    can process them, then :meth:`disconnect(wait=True) <sleekxmpp.xmlstream.XMLStream.disconnect>`
+    can process them, then :meth:`disconnect(wait=True) <slixmpp.xmlstream.XMLStream.disconnect>`
    will block and not disconnect.

 Final Product
--- a/docs/guide_xep_0030.rst
+++ b/docs/guide_xep_0030.rst
@@ -18,7 +18,7 @@ Working with service discovery is about creating and querying these nodes.
 According to XEP-0030, a node may contain three types of information:
 identities, features, and items. (Further, extensible, information types are
 defined in `XEP-0128 <http://xmpp.org/extensions/xep-0128.html>`_, but they are
-not yet implemented by SleekXMPP.) SleekXMPP provides methods to configure each
+not yet implemented by Slixmpp.) Slixmpp provides methods to configure each
 of these node attributes.

 Configuring Service Discovery
@@ -119,7 +119,7 @@ the same order as expected using positional arguments.

    xmpp['xep_0030'].add_identity(category='client',
                                  itype='bot',
-                                  name='Sleek',
+                                  name='Slixmpp',
                                  node='foo',
                                  jid=xmpp.boundjid.full,
                                  lang='no')
@@ -159,7 +159,7 @@ item itself, and the JID and node that will own the item.
 .. note::

    In this case, the owning JID and node are provided with the
-    parameters ``ijid`` and ``node``. 
+    parameters ``ijid`` and ``node``.

 Peforming Disco Queries
 -----------------------
@@ -197,5 +197,5 @@ a full Iq stanza.

    info = self['xep_0030'].get_info(node='foo', local=True)
    items = self['xep_0030'].get_items(jid='somejid@mycomponent.example.com',
-                                       node='bar', 
+                                       node='bar',
                                       local=True)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,49 +1,49 @@
-SleekXMPP
+Slixmpp
 #########

 .. sidebar:: Get the Code

    .. code-block:: sh

-        pip install sleekxmpp
+        pip install slixmpp

-    The latest source code for SleekXMPP may be found on `Github
-    <http://github.com/fritzy/SleekXMPP>`_. Releases can be found in the
+    The latest source code for Slixmpp may be found on `Github
+    <http://github.com/fritzy/Slixmpp>`_. Releases can be found in the
    ``master`` branch, while the latest development version is in the
    ``develop`` branch.

    **Latest Stable Release**
-        - `1.0 <http://github.com/fritzy/SleekXMPP/zipball/1.0>`_
+        - `1.0 <http://github.com/fritzy/Slixmpp/zipball/1.0>`_

    **Develop Releases**
-        - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_
+        - `Latest Develop Version <http://github.com/fritzy/Slixmpp/zipball/develop>`_


    A mailing list and XMPP chat room are available for discussing and getting
-    help with SleekXMPP.
+    help with Slixmpp.

    **Mailing List**
-        `SleekXMPP Discussion on Google Groups <http://groups.google.com/group/sleekxmpp-discussion>`_
+        `Slixmpp Discussion on Google Groups <http://groups.google.com/group/slixmpp-discussion>`_

    **Chat**
        `sleek@conference.jabber.org <xmpp:sleek@conference.jabber.org?join>`_


-SleekXMPP is an :ref:`MIT licensed <license>` XMPP library for Python 2.6/3.1+,
+Slixmpp is an :ref:`MIT licensed <license>` XMPP library for Python 2.6/3.1+,
 and is featured in examples in
-`XMPP: The Definitive Guide <http://oreilly.com/catalog/9780596521271>`_ 
+`XMPP: The Definitive Guide <http://oreilly.com/catalog/9780596521271>`_
 by Kevin Smith, Remko Tronçon, and Peter Saint-Andre. If you've arrived
 here from reading the Definitive Guide, please see the notes on updating
-the examples to the latest version of SleekXMPP.
+the examples to the latest version of Slixmpp.

-SleekXMPP's design goals and philosphy are:
+Slixmpp's design goals and philosphy are:

 **Low number of dependencies**
-    Installing and using SleekXMPP should be as simple as possible, without
+    Installing and using Slixmpp should be as simple as possible, without
    having to deal with long dependency chains.

    As part of reducing the number of dependencies, some third party
-    modules are included with SleekXMPP in the ``thirdparty`` directory.
+    modules are included with Slixmpp in the ``thirdparty`` directory.
    Imports from this module first try to import an existing installed
    version before loading the packaged version, when possible.

@@ -55,19 +55,19 @@ SleekXMPP's design goals and philosphy are:
    XEPs.

 **Rewarding to work with**
-    As much as possible, SleekXMPP should allow things to "just work" using
+    As much as possible, Slixmpp should allow things to "just work" using
    sensible defaults and appropriate abstractions. XML can be ugly to work
    with, but it doesn't have to be that way.

-Here's your first SleekXMPP Bot:
+Here's your first Slixmpp Bot:
 --------------------------------

 .. code-block:: python

    import logging

-    from sleekxmpp import ClientXMPP
-    from sleekxmpp.exceptions import IqError, IqTimeout
+    from slixmpp import ClientXMPP
+    from slixmpp.exceptions import IqError, IqTimeout


    class EchoBot(ClientXMPP):
@@ -113,7 +113,7 @@ Here's your first SleekXMPP Bot:


    if __name__ == '__main__':
-        # Ideally use optparse or argparse to get JID, 
+        # Ideally use optparse or argparse to get JID,
        # password, and log level.

        logging.basicConfig(level=logging.DEBUG,
@@ -129,7 +129,7 @@ Getting Started (with Examples)
 -------------------------------
 .. toctree::
    :maxdepth: 1
-    
+
    getting_started/echobot
    getting_started/sendlogout
    getting_started/component
@@ -144,7 +144,7 @@ Tutorials, FAQs, and How To Guides
 ----------------------------------
 .. toctree::
    :maxdepth: 1
-   
+
    faq
    xeps
    xmpp_tdg
@@ -156,12 +156,12 @@ Tutorials, FAQs, and How To Guides

 Plugin Guides
 ~~~~~~~~~~~~~
-.. toctree:: 
+.. toctree::
    :maxdepth: 1

    guide_xep_0030

-SleekXMPP Architecture and Design
+Slixmpp Architecture and Design
 ---------------------------------
 .. toctree::
    :maxdepth: 3
@@ -173,7 +173,7 @@ API Reference
 -------------
 .. toctree::
    :maxdepth: 2
-    
+
    event_index
    api/clientxmpp
    api/componentxmpp
--- a/docs/license.rst
+++ b/docs/license.rst
@@ -1,4 +1,4 @@
-.. _license: 
+.. _license:

 License (MIT)
 =============
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -95,9 +95,9 @@ if "%1" == "qthelp" (
 	echo.
 	echo.Build finished; now you can run "qcollectiongenerator" with the ^
 .qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\SleekXMPP.qhcp
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Slixmpp.qhcp
 	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\SleekXMPP.ghc
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Slixmpp.ghc
 	goto end
 )

--- a/docs/xeps.rst
+++ b/docs/xeps.rst
@@ -4,9 +4,9 @@ Supported XEPS
 ======= ============================= ================
 XEP     Description                   Notes
 ======= ============================= ================
-`0004`_ Data forms                   
-`0009`_ Jabber RPC                   
-`0012`_ Last Activity             
+`0004`_ Data forms
+`0009`_ Jabber RPC
+`0012`_ Last Activity
 `0030`_ Service Discovery
 `0033`_ Extended Stanza Addressing
 `0045`_ Multi-User Chat (MUC)         Client-side only
--- a/docs/xmpp_tdg.rst
+++ b/docs/xmpp_tdg.rst
@@ -1,20 +1,20 @@
 Following *XMPP: The Definitive Guide*
 ======================================

-SleekXMPP was featured in the first edition of the O'Reilly book 
+Slixmpp was featured in the first edition of the O'Reilly book
 `XMPP: The Definitive Guide <http://oreilly.com/catalog/9780596521271/>`_
 by Peter Saint-Andre, Kevin Smith, and Remko Tronçon. The original source code
 for the book's examples can be found at http://github.com/remko/xmpp-tdg. An
 updated version of the source code, maintained to stay current with the latest
-SleekXMPP release, is available at http://github.com/legastero/xmpp-tdg.
+Slixmpp release, is available at http://github.com/legastero/xmpp-tdg.

-However, since publication, SleekXMPP has advanced from version 0.2.1 to version
+However, since publication, Slixmpp has advanced from version 0.2.1 to version
 1.0 and there have been several major API changes. The most notable is the
 introduction of :term:`stanza objects <stanza object>` which have simplified and
 standardized interactions with the XMPP XML stream.

 What follows is a walk-through of *The Definitive Guide* highlighting the
-changes needed to make the code examples work with version 1.0 of SleekXMPP.
+changes needed to make the code examples work with version 1.0 of Slixmpp.
 These changes have been kept to a minimum to preserve the correlation with
 the book's explanations, so be aware that some code may not use current best
 practices.
@@ -36,7 +36,7 @@ Updated Code
 .. code-block:: python

    def handleIncomingMessage(self, message):
-        self.xmpp.sendMessage(message["from"], message["body"])
+        self.xmpp.send_message(message["from"], message["body"])

 `View full source <http://github.com/legastero/xmpp-tdg/blob/master/code/EchoBot/EchoBot.py>`_ |
 `View original code <http://github.com/remko/xmpp-tdg/blob/master/code/EchoBot/EchoBot.py>`_
@@ -47,7 +47,7 @@ Example 14-1. (Page 215)
 **CheshiR IM bot implementation.**

 The main event handling method in the Bot class is meant to process both message
-events and presence update events. With the new changes in SleekXMPP 1.0,
+events and presence update events. With the new changes in Slixmpp 1.0,
 extracting a CheshiR status "message" from both types of stanzas
 requires accessing different attributes. In the case of a message stanza, the
 ``"body"`` attribute would contain the CheshiR message. For a presence event,
@@ -72,21 +72,21 @@ Updated Code
 .. code-block:: python

  def handleIncomingXMPPEvent(self, event):
-    msgLocations = {sleekxmpp.stanza.presence.Presence: "status",
-                    sleekxmpp.stanza.message.Message: "body"}
+    msgLocations = {slixmpp.stanza.presence.Presence: "status",
+                    slixmpp.stanza.message.Message: "body"}

    message = event[msgLocations[type(event)]]
    user = self.backend.getUserFromJID(event["from"].jid)
    if user is not None:
      self.backend.addMessageFromUser(message, user)
-  
+
  def handleMessageAddedToBackend(self, message) :
    body = message.user + ": " + message.text
    htmlBody = "<p><a href='%(uri)s'>%(user)s</a>: %(message)s</p>" % {
      "uri": self.url + "/" + message.user,
      "user" : message.user, "message" : message.text }
    for subscriberJID in self.backend.getSubscriberJIDs(message.user) :
-      self.xmpp.sendMessage(subscriberJID, body, mhtml=htmlBody)
+      self.xmpp.send_message(subscriberJID, body, mhtml=htmlBody)

 `View full source <http://github.com/legastero/xmpp-tdg/blob/master/code/CheshiR/Bot.py>`_ |
 `View original code <http://github.com/remko/xmpp-tdg/blob/master/code/CheshiR/Bot.py>`_
@@ -102,7 +102,7 @@ Example 14-3. (Page 217)

 The main difference for the configurable IM bot is the handling for the
 data form in ``handleConfigurationCommand``. The test for equality
-with the string ``"1"`` is no longer required; SleekXMPP converts
+with the string ``"1"`` is no longer required; Slixmpp converts
 boolean data form fields to the values ``True`` and ``False``
 automatically.

@@ -145,7 +145,7 @@ Example 14-4. (Page 220)

 Like several previous examples, a needed change is to replace
 ``subscription["from"]`` with ``subscription["from"].jid`` because the
-``BaseXMPP`` method ``makePresence`` requires the JID to be a string.
+``BaseXMPP`` method ``make_presence`` requires the JID to be a string.

 A correction needs to be made in ``handleXMPPPresenceProbe`` because a line was
 left out of the original implementation; the variable ``user`` is undefined. The
@@ -154,7 +154,7 @@ JID of the user can be extracted from the presence stanza's ``from`` attribute.
 Since this implementation of CheshiR uses an XMPP component, it must
 include a ``from`` attribute in all messages that it sends. Adding the
 ``from`` attribute is done by including ``mfrom=self.xmpp.jid`` in calls to
-``self.xmpp.sendMessage``.
+``self.xmpp.send_message``.

 Updated Code
 ~~~~~~~~~~~~
@@ -162,19 +162,19 @@ Updated Code
 .. code-block:: python

  def handleXMPPPresenceProbe(self, event) :
-    self.xmpp.sendPresence(pto = event["from"])
+    self.xmpp.send_presence(pto = event["from"])

  def handleXMPPPresenceSubscription(self, subscription) :
    if subscription["type"] == "subscribe" :
      userJID = subscription["from"].jid
-      self.xmpp.sendPresenceSubscription(pto=userJID, ptype="subscribed")
-      self.xmpp.sendPresence(pto = userJID)
-      self.xmpp.sendPresenceSubscription(pto=userJID, ptype="subscribe")
+      self.xmpp.send_presence_subscription(pto=userJID, ptype="subscribed")
+      self.xmpp.send_presence(pto = userJID)
+      self.xmpp.send_presence_subscription(pto=userJID, ptype="subscribe")

  def handleMessageAddedToBackend(self, message) :
    body = message.user + ": " + message.text
    for subscriberJID in self.backend.getSubscriberJIDs(message.user) :
-      self.xmpp.sendMessage(subscriberJID, body, mfrom=self.xmpp.jid)
+      self.xmpp.send_message(subscriberJID, body, mfrom=self.xmpp.jid)

 `View full source <http://github.com/legastero/xmpp-tdg/blob/master/code/CheshiR/SimpleComponent.py>`_ |
 `View original code <http://github.com/remko/xmpp-tdg/blob/master/code/CheshiR/SimpleComponent.py>`_
@@ -192,7 +192,7 @@ After applying the changes from Example 14-4 above, the registrable component
 implementation should work correctly.

 .. tip::
-    To see how to implement in-band registration as a SleekXMPP plugin,
+    To see how to implement in-band registration as a Slixmpp plugin,
    see the tutorial :ref:`tutorial-create-plugin`.

 `View full source <http://github.com/legastero/xmpp-tdg/blob/master/code/CheshiR/RegistrableComponent.py>`_ |
@@ -203,13 +203,13 @@ Example 14-7. (Page 225)
 **Extended CheshiR IM server component implementation.**

 .. note::
-    Since the CheshiR examples build on each other, see previous 
+    Since the CheshiR examples build on each other, see previous
    sections for corrections to code that is not marked as new in the book
    example.

 While the final code example can look daunting with all of the changes
 made, it requires very few modifications to work with the latest version of
-SleekXMPP. Most differences are the result of CheshiR's backend functions
+Slixmpp. Most differences are the result of CheshiR's backend functions
 expecting JIDs to be strings so that they can be stripped to bare JIDs. To
 resolve these, use the ``jid`` attribute of the JID objects. Also,
 references to ``"message"`` and ``"jid"`` attributes need to
@@ -239,11 +239,11 @@ Updated Code
      userJID = subscription["from"].jid
      user = self.backend.getUserFromJID(userJID)
      contactJID = subscription["to"]
-      self.xmpp.sendPresenceSubscription(
+      self.xmpp.send_presence_subscription(
          pfrom=contactJID, pto=userJID, ptype="subscribed", pnick=user)
      self.sendPresenceOfContactToUser(contactJID=contactJID, userJID=userJID)
      if contactJID == self.componentDomain :
        self.sendAllContactSubscriptionRequestsToUser(userJID)

 `View full source <http://github.com/legastero/xmpp-tdg/blob/master/code/CheshiR/Component.py>`_ |
-`View original code <http://github.com/remko/xmpp-tdg/blob/master/code/CheshiR/Component.py>`_ 
+`View original code <http://github.com/remko/xmpp-tdg/blob/master/code/CheshiR/Component.py>`_
--- a/examples/IoT_TestDevice.py
+++ b/examples/IoT_TestDevice.py
@@ -1,12 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Implementation of xeps for Internet of Things
    http://wiki.xmpp.org/web/Tech_pages/IoT_systems
    Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """
@@ -14,7 +14,7 @@
 import os
 import sys
 # This can be used when you are in a test environment and need to make paths right
-sys.path=['/Users/jocke/Dropbox/06_dev/SleekXMPP']+sys.path
+sys.path=['/Users/jocke/Dropbox/06_dev/Slixmpp']+sys.path

 import logging
 import unittest
@@ -23,31 +23,21 @@ import datetime

 from glob import glob
 from os.path import splitext, basename, join as pjoin
-from optparse import OptionParser
+from argparse import ArgumentParser
 from urllib import urlopen

-import sleekxmpp
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp
+from slixmpp.plugins.xep_0323.device import Device

-from sleekxmpp.plugins.xep_0323.device import Device
+#from slixmpp.exceptions import IqError, IqTimeout

-#from sleekxmpp.exceptions import IqError, IqTimeout
-
-class IoT_TestDevice(sleekxmpp.ClientXMPP):
+class IoT_TestDevice(slixmpp.ClientXMPP):

    """
    A simple IoT device that can act as server or client
    """
    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)
        self.add_event_handler("session_start", self.session_start)
        self.add_event_handler("message", self.message)
        self.device=None
@@ -125,47 +115,44 @@ if __name__ == '__main__':
    #
    #   "client" an IoT device or other party that would like to get data from another device

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

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
-    optp.add_option('-t', '--pingto', help='set jid to ping',
-                    action='store', type='string', dest='pingjid',
-                    default=None)
+    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)
+    parser.add_argument("-t", "--pingto", help="set jid to ping",
+                        action="store", type="string", dest="pingjid",
+                        default=None)

    # JID and password options.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

    # IoT test
-    optp.add_option("-c", "--sensorjid", dest="sensorjid",
-                    help="Another device to call for data on", default=None)
-    optp.add_option("-n", "--nodeid", dest="nodeid",
-                    help="I am a device get ready to be called", default=None)
+    parser.add_argument("-c", "--sensorjid", dest="sensorjid",
+                        help="Another device to call for data on", default=None)
+    parser.add_argument("-n", "--nodeid", dest="nodeid",
+                        help="I am a device get ready to be called", default=None)

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

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

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


-    xmpp = IoT_TestDevice(opts.jid,opts.password)
+    xmpp = IoT_TestDevice(args.jid,args.password)
    xmpp.register_plugin('xep_0030')
    #xmpp['xep_0030'].add_feature(feature='urn:xmpp:iot:sensordata',
    #                             node=None,
@@ -173,27 +160,27 @@ if __name__ == '__main__':
    xmpp.register_plugin('xep_0323')
    xmpp.register_plugin('xep_0325')

-    if opts.nodeid:
+    if args.nodeid:

        # xmpp['xep_0030'].add_feature(feature='urn:xmpp:sn',
-        # node=opts.nodeid,
+        # node=args.nodeid,
        # jid=xmpp.boundjid.full)

-        myDevice = TheDevice(opts.nodeid);
+        myDevice = TheDevice(args.nodeid);
        # myDevice._add_field(name="Relay", typename="numeric", unit="Bool");
        myDevice._add_field(name="Temperature", typename="numeric", unit="C");
        myDevice._set_momentary_timestamp("2013-03-07T16:24:30")
        myDevice._add_field_momentary_data("Temperature", "23.4", flags={"automaticReadout": "true"});

-        xmpp['xep_0323'].register_node(nodeId=opts.nodeid, device=myDevice, commTimeout=10);
+        xmpp['xep_0323'].register_node(nodeId=args.nodeid, device=myDevice, commTimeout=10);
        xmpp.beClientOrServer(server=True)
        while not(xmpp.testForRelease()):
            xmpp.connect()
            xmpp.process(block=True)
            logging.debug("lost connection")
-    if opts.sensorjid:
+    if args.sensorjid:
        logging.debug("will try to call another device for data")
-        xmpp.beClientOrServer(server=False,clientJID=opts.sensorjid)
+        xmpp.beClientOrServer(server=False,clientJID=args.sensorjid)
        xmpp.connect()
        xmpp.process(block=True)
        logging.debug("ready ending")
--- a/examples/adhoc_provider.py
+++ b/examples/adhoc_provider.py
@@ -1,41 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class CommandBot(sleekxmpp.ClientXMPP):
+class CommandBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that provides a basic
+    A simple Slixmpp bot that provides a basic
    adhoc command.
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__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
@@ -143,62 +132,42 @@ class CommandBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

    # Setup the CommandBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = CommandBot(opts.jid, opts.password)
+    xmpp = CommandBot(args.jid, args.password)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0050') # Adhoc Commands
    xmpp.register_plugin('xep_0199', {'keepalive': True, 'frequency':15})

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/adhoc_user.py
+++ b/examples/adhoc_user.py
@@ -1,41 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class CommandUserBot(sleekxmpp.ClientXMPP):
+class CommandUserBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that uses the adhoc command
+    A simple Slixmpp bot that uses the adhoc command
    provided by the adhoc_provider.py example.
    """

    def __init__(self, jid, password, other, greeting):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.command_provider = other
        self.greeting = greeting
@@ -142,69 +131,49 @@ class CommandUserBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-o", "--other", dest="other",
-                    help="JID providing commands")
-    optp.add_option("-g", "--greeting", dest="greeting",
-                    help="Greeting")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-o", "--other", dest="other",
+                        help="JID providing commands")
+    parser.add_argument("-g", "--greeting", dest="greeting",
+                        help="Greeting")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.other is None:
-        opts.other = raw_input("JID Providing Commands: ")
-    if opts.greeting is None:
-        opts.greeting = raw_input("Greeting: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.other is None:
+        args.other = input("JID Providing Commands: ")
+    if args.greeting is None:
+        args.greeting = input("Greeting: ")

    # Setup the CommandBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = CommandUserBot(opts.jid, opts.password, opts.other, opts.greeting)
+    xmpp = CommandUserBot(args.jid, args.password, args.other, args.greeting)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0050') # Adhoc Commands

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/admin_commands.py
+++ b/examples/admin_commands.py
@@ -1,41 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class AdminCommands(sleekxmpp.ClientXMPP):
+class AdminCommands(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that uses admin commands to
+    A simple Slixmpp bot that uses admin commands to
    add a new user to a server.
    """

    def __init__(self, jid, password, command):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.command = command

@@ -81,13 +70,13 @@ class AdminCommands(sleekxmpp.ClientXMPP):
            for var, field in form['fields'].items():
                if var != 'FORM_TYPE':
                    if field['type'] == 'boolean':
-                        answers[var] = raw_input('%s (y/n): ' % field['label'])
+                        answers[var] = input('%s (y/n): ' % field['label'])
                        if answers[var].lower() in ('1', 'true', 'y', 'yes'):
                            answers[var] = '1'
                        else:
                            answers[var] = '0'
                    else:
-                        answers[var] = raw_input('%s: ' % field['label'])
+                        answers[var] = input('%s: ' % field['label'])
                else:
                    answers['FORM_TYPE'] = field['value']
            form['type'] = 'submit'
@@ -116,63 +105,43 @@ class AdminCommands(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-c", "--command", dest="command",
-                    help="admin command to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-c", "--command", dest="command",
+                        help="admin command to use")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.command is None:
-        opts.command = raw_input("Admin command: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.command is None:
+        args.command = input("Admin command: ")

    # Setup the CommandBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = AdminCommands(opts.jid, opts.password, opts.command)
+    xmpp = AdminCommands(args.jid, args.password, args.command)
    xmpp.register_plugin('xep_0133') # Service Administration

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/custom_stanzas/custom_stanza_provider.py
+++ b/examples/custom_stanzas/custom_stanza_provider.py
@@ -1,48 +1,37 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
+import slixmpp

-from sleekxmpp import ClientXMPP, Iq
-from sleekxmpp.exceptions import IqError, IqTimeout, XMPPError
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
+from slixmpp import ClientXMPP, Iq
+from slixmpp.exceptions import IqError, IqTimeout, XMPPError
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
 from stanza import Action

-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input

-
-class ActionBot(sleekxmpp.ClientXMPP):
+class ActionBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that receives a custom stanza
+    A simple Slixmpp bot that receives a custom stanza
    from another client.
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__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
@@ -57,8 +46,7 @@ class ActionBot(sleekxmpp.ClientXMPP):
            self._handle_action))

        self.add_event_handler('custom_action',
-                self._handle_action_event,
-                threaded=True)
+                self._handle_action_event)

        register_stanza_plugin(Iq, Action)

@@ -88,10 +76,6 @@ class ActionBot(sleekxmpp.ClientXMPP):
    def _handle_action_event(self, iq):
        """
        Respond to the custom action event.
-
-        Since one of the actions is to disconnect, this
-        event handler needs to be run in threaded mode, by
-        using `threaded=True` in the `add_event_handler` call.
        """
        method = iq['action']['method']
        param = iq['action']['param']
@@ -112,62 +96,42 @@ class ActionBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

    # Setup the CommandBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = ActionBot(opts.jid, opts.password)
+    xmpp = ActionBot(args.jid, args.password)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0050') # Adhoc Commands
    xmpp.register_plugin('xep_0199', {'keepalive': True, 'frequency':15})

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/custom_stanzas/custom_stanza_user.py
+++ b/examples/custom_stanzas/custom_stanza_user.py
@@ -1,46 +1,35 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-from sleekxmpp import Iq
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import register_stanza_plugin
+import slixmpp
+from slixmpp import Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import register_stanza_plugin

 from stanza import Action

-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input

-
-class ActionUserBot(sleekxmpp.ClientXMPP):
+class ActionUserBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that sends a custom action stanza
+    A simple Slixmpp bot that sends a custom action stanza
    to another client.
    """

    def __init__(self, jid, password, other):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.action_provider = other

@@ -49,7 +38,7 @@ class ActionUserBot(sleekxmpp.ClientXMPP):
        # 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, threaded=True)
+        self.add_event_handler("session_start", self.start)
        self.add_event_handler("message", self.message)

        register_stanza_plugin(Iq, Action)
@@ -93,10 +82,8 @@ class ActionUserBot(sleekxmpp.ClientXMPP):
                iq2['type'] = 'set'
                iq2['action']['method'] = 'bye'
                iq2.send(block=False)
-            
-                # The wait=True delays the disconnect until the queue
-                # of stanzas to be sent becomes empty.
-                self.disconnect(wait=True)
+
+                self.disconnect()
        except XMPPError:
            print('There was an error sending the custom action.')

@@ -111,65 +98,45 @@ class ActionUserBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-o", "--other", dest="other",
-                    help="JID providing custom stanza")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-o", "--other", dest="other",
+                        help="JID providing custom stanza")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.other is None:
-        opts.other = raw_input("JID Providing custom stanza: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.other is None:
+        args.other = input("JID Providing custom stanza: ")

    # Setup the CommandBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = ActionUserBot(opts.jid, opts.password, opts.other)
+    xmpp = ActionUserBot(args.jid, args.password, args.other)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0050') # Adhoc Commands

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/custom_stanzas/stanza.py
+++ b/examples/custom_stanzas/stanza.py
@@ -1,30 +1,30 @@
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase

 class Action(ElementBase):

    """
    A stanza class for XML content of the form:

-    <action xmlns="sleekxmpp:custom:actions">
+    <action xmlns="slixmpp:custom:actions">
      <method>X</method>
      <param>X</param>
      <status>X</status>
    </action>
    """
-   
+
    #: The `name` field refers to the basic XML tag name of the
    #: stanza. Here, the tag name will be 'action'.
    name = 'action'

    #: The namespace of the main XML tag.
-    namespace = 'sleekxmpp:custom:actions'
+    namespace = 'slixmpp:custom:actions'

    #: The `plugin_attrib` value is the name that can be used
    #: with a parent stanza to access this stanza. For example
    #: from an Iq stanza object, accessing:
-    #: 
+    #:
    #:     iq['action']
-    #: 
+    #:
    #: would reference an Action object, and will even create
    #: an Action object and append it to the Iq stanza if
    #: one doesn't already exist.
@@ -49,8 +49,8 @@ class Action(ElementBase):
    #: the sub_interfaces set. For example, here all interfaces
    #: are marked as sub_interfaces, and so the XML produced will
    #: look like:
-    #: 
-    #:     <action xmlns="sleekxmpp:custom:actions">
+    #:
+    #:     <action xmlns="slixmpp:custom:actions">
    #:       <method>foo</method>
    #:     </action>
    sub_interfaces = interfaces
--- a/examples/disco_browser.py
+++ b/examples/disco_browser.py
@@ -1,35 +1,23 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-from sleekxmpp.exceptions import IqError, IqTimeout
+import slixmpp
+from slixmpp.exceptions import IqError, IqTimeout


-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
-
-
-class Disco(sleekxmpp.ClientXMPP):
+class Disco(slixmpp.ClientXMPP):

    """
    A demonstration for using basic service discovery.
@@ -42,7 +30,7 @@ class Disco(sleekxmpp.ClientXMPP):
    """

    def __init__(self, jid, password, target_jid, target_node='', get=''):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        # Using service discovery requires the XEP-0030 plugin.
        self.register_plugin('xep_0030')
@@ -63,7 +51,7 @@ class Disco(sleekxmpp.ClientXMPP):
        # 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, threaded=True)
+        self.add_event_handler("session_start", self.start)

    def start(self, event):
        """
@@ -136,69 +124,42 @@ class Disco(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
-    optp.version = '%%prog 0.1'
-    optp.usage = "Usage: %%prog [options] %s <jid> [<node>]" % \
-                             'all|info|items|identities|features'
+    parser = ArgumentParser(description=Disco.__doc__)

-    optp.add_option('-q','--quiet', help='set logging to ERROR',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.ERROR,
-                    default=logging.ERROR)
-    optp.add_option('-d','--debug', help='set logging to DEBUG',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.DEBUG,
-                    default=logging.ERROR)
-    optp.add_option('-v','--verbose', help='set logging to COMM',
-                    action='store_const',
-                    dest='loglevel',
-                    const=5,
-                    default=logging.ERROR)
+    parser.add_argument("-q","--quiet", help="set logging to ERROR",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.ERROR,
+                        default=logging.ERROR)
+    parser.add_argument("-d","--debug", help="set logging to DEBUG",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.DEBUG,
+                        default=logging.ERROR)

    # JID and password options.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    opts,args = optp.parse_args()
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("query", choices=["all", "info", "items", "identities", "features"])
+    parser.add_argument("target-jid")
+    parser.add_argument("node", nargs='?')
+
+    args = parser.parse_args()

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

-    if len(args) < 2:
-        optp.print_help()
-        exit()
-
-    if len(args) == 2:
-        args = (args[0], args[1], '')
-
-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")

    # Setup the Disco browser.
-    xmpp = Disco(opts.jid, opts.password, args[1], args[2], args[0])
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
+    xmpp = Disco(args.jid, args.password, args.target_jid, args.node, args.query)

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/download_avatars.py
+++ b/examples/download_avatars.py
@@ -1,33 +1,21 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2012  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-from sleekxmpp.exceptions import XMPPError
-
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp
+from slixmpp.exceptions import XMPPError


 FILE_TYPES = {
@@ -37,15 +25,15 @@ FILE_TYPES = {
 }


-class AvatarDownloader(sleekxmpp.ClientXMPP):
+class AvatarDownloader(slixmpp.ClientXMPP):

    """
    A basic script for downloading the avatars for a user's contacts.
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
-        self.add_event_handler("session_start", self.start, threaded=True)
+        slixmpp.ClientXMPP.__init__(self, jid, password)
+        self.add_event_handler("session_start", self.start)
        self.add_event_handler("changed_status", self.wait_for_presences)

        self.add_event_handler('vcard_avatar_update', self.on_vcard_avatar)
@@ -72,7 +60,7 @@ class AvatarDownloader(sleekxmpp.ClientXMPP):

        print('Waiting for presence updates...\n')
        self.presences_received.wait(15)
-        self.disconnect(wait=True)
+        self.disconnect()

    def on_vcard_avatar(self, pres):
        print("Received vCard avatar update from %s" % pres['from'].bare)
@@ -125,60 +113,40 @@ class AvatarDownloader(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
-    optp.add_option('-q','--quiet', help='set logging to ERROR',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.ERROR,
-                    default=logging.ERROR)
-    optp.add_option('-d','--debug', help='set logging to DEBUG',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.DEBUG,
-                    default=logging.ERROR)
-    optp.add_option('-v','--verbose', help='set logging to COMM',
-                    action='store_const',
-                    dest='loglevel',
-                    const=5,
-                    default=logging.ERROR)
+    parser = ArgumentParser()
+    parser.add_argument("-q","--quiet", help="set logging to ERROR",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.ERROR,
+                        default=logging.ERROR)
+    parser.add_argument("-d","--debug", help="set logging to DEBUG",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.DEBUG,
+                        default=logging.ERROR)

    # JID and password options.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    opts,args = optp.parse_args()
+    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=opts.loglevel,
+    logging.basicConfig(level=args.loglevel,
                        format='%(levelname)-8s %(message)s')

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

-    xmpp = AvatarDownloader(opts.jid, opts.password)
+    xmpp = AvatarDownloader(args.jid, args.password)
    xmpp.register_plugin('xep_0054')
    xmpp.register_plugin('xep_0153')
    xmpp.register_plugin('xep_0084')

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/echo_client.py
+++ b/examples/echo_client.py
@@ -1,41 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class EchoBot(sleekxmpp.ClientXMPP):
+class EchoBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that will echo messages it
+    A simple Slixmpp bot that will echo messages it
    receives, along with a short thank you message.
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__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
@@ -83,75 +72,42 @@ class EchoBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser(description=EchoBot.__doc__)

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("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(opts.jid, opts.password)
+    xmpp = EchoBot(args.jid, args.password)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0060') # PubSub
    xmpp.register_plugin('xep_0199') # XMPP Ping

-    # If you are connecting to Facebook and wish to use the
-    # X-FACEBOOK-PLATFORM authentication mechanism, you will need
-    # your API key and an access token. Then you'll set:
-    # xmpp.credentials['api_key'] = 'THE_API_KEY'
-    # xmpp.credentials['access_token'] = 'THE_ACCESS_TOKEN'
-
-    # If you are connecting to MSN, then you will need an
-    # access token, and it does not matter what JID you
-    # specify other than that the domain is 'messenger.live.com',
-    # so '_@messenger.live.com' will work. You can specify
-    # the access token as so:
-    # xmpp.credentials['access_token'] = 'THE_ACCESS_TOKEN'
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/echo_component.py
+++ b/examples/echo_component.py
@@ -1,37 +1,26 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-from sleekxmpp.componentxmpp import ComponentXMPP
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp
+from slixmpp.componentxmpp import ComponentXMPP


 class EchoComponent(ComponentXMPP):

    """
-    A simple SleekXMPP component that echoes messages.
+    A simple Slixmpp component that echoes messages.
    """

    def __init__(self, jid, secret, server, port):
@@ -67,56 +56,50 @@ class EchoComponent(ComponentXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser(description=EchoComponent.__doc__)

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-s", "--server", dest="server",
-                    help="server to connect to")
-    optp.add_option("-P", "--port", dest="port",
-                    help="port to connect to")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-s", "--server", dest="server",
+                        help="server to connect to")
+    parser.add_argument("-P", "--port", dest="port",
+                        help="port to connect to")

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

-    if opts.jid is None:
-        opts.jid = raw_input("Component JID: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.server is None:
-        opts.server = raw_input("Server: ")
-    if opts.port is None:
-        opts.port = int(raw_input("Port: "))
+    if args.jid is None:
+        args.jid = input("Component JID: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.server is None:
+        args.server = input("Server: ")
+    if args.port is None:
+        args.port = int(input("Port: "))

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

    # Setup the EchoComponent and register plugins. Note that while plugins
    # may have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = EchoComponent(opts.jid, opts.password, opts.server, opts.port)
-    xmpp.registerPlugin('xep_0030') # Service Discovery
-    xmpp.registerPlugin('xep_0004') # Data Forms
-    xmpp.registerPlugin('xep_0060') # PubSub
-    xmpp.registerPlugin('xep_0199') # XMPP Ping
+    xmpp = EchoComponent(args.jid, args.password, args.server, args.port)
+    xmpp.register_plugin('xep_0030') # Service Discovery
+    xmpp.register_plugin('xep_0004') # Data Forms
+    xmpp.register_plugin('xep_0060') # PubSub
+    xmpp.register_plugin('xep_0199') # XMPP Ping

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/gtalk_custom_domain.py
+++ b/examples/gtalk_custom_domain.py
@@ -1,46 +1,34 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
+import slixmpp

 import ssl
-from sleekxmpp.xmlstream import cert
+from slixmpp.xmlstream import cert


-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
-
-
-class GTalkBot(sleekxmpp.ClientXMPP):
+class GTalkBot(slixmpp.ClientXMPP):

    """
-    A demonstration of using SleekXMPP with accounts from a Google Apps
+    A demonstration of using Slixmpp with accounts from a Google Apps
    account with a custom domain, because it requires custom certificate
    validation.
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__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
@@ -104,62 +92,42 @@ class GTalkBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

    # Setup the GTalkBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = GTalkBot(opts.jid, opts.password)
+    xmpp = GTalkBot(args.jid, args.password)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0060') # PubSub
    xmpp.register_plugin('xep_0199') # XMPP Ping

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/ibb_transfer/ibb_receiver.py
+++ b/examples/ibb_transfer/ibb_receiver.py
@@ -1,40 +1,29 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class IBBReceiver(sleekxmpp.ClientXMPP):
+class IBBReceiver(slixmpp.ClientXMPP):

    """
    A basic example of creating and using an in-band bytestream.
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.register_plugin('xep_0030') # Service Discovery
        self.register_plugin('xep_0047', {
@@ -48,7 +37,7 @@ class IBBReceiver(sleekxmpp.ClientXMPP):
        # our roster.
        self.add_event_handler("session_start", self.start)

-        self.add_event_handler("ibb_stream_start", self.stream_opened, threaded=True)
+        self.add_event_handler("ibb_stream_start", self.stream_opened)
        self.add_event_handler("ibb_stream_data", self.stream_data)

    def start(self, event):
@@ -93,55 +82,35 @@ class IBBReceiver(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

-    xmpp = IBBReceiver(opts.jid, opts.password)
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
+    xmpp = IBBReceiver(args.jid, args.password)

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/ibb_transfer/ibb_sender.py
+++ b/examples/ibb_transfer/ibb_sender.py
@@ -1,40 +1,29 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class IBBSender(sleekxmpp.ClientXMPP):
+class IBBSender(slixmpp.ClientXMPP):

    """
    A basic example of creating and using an in-band bytestream.
    """

    def __init__(self, jid, password, receiver, filename):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.receiver = receiver
        self.filename = filename
@@ -75,71 +64,51 @@ class IBBSender(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-r", "--receiver", dest="receiver",
-                    help="JID to use")
-    optp.add_option("-f", "--file", dest="filename",
-                    help="JID to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-r", "--receiver", dest="receiver",
+                        help="JID to use")
+    parser.add_argument("-f", "--file", dest="filename",
+                        help="JID to use")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.receiver is None:
-        opts.receiver = raw_input("Receiver: ")
-    if opts.filename is None:
-        opts.filename = raw_input("File path: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.receiver is None:
+        args.receiver = input("Receiver: ")
+    if args.filename is None:
+        args.filename = input("File path: ")

    # Setup the EchoBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = IBBSender(opts.jid, opts.password, opts.receiver, opts.filename)
+    xmpp = IBBSender(args.jid, args.password, args.receiver, args.filename)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0047') # In-band Bytestreams
    xmpp.register_plugin('xep_0060') # PubSub
    xmpp.register_plugin('xep_0199') # XMPP Ping

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/migrate_roster.py
+++ b/examples/migrate_roster.py
@@ -1,68 +1,55 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


 # Setup the command line arguments.
-optp = OptionParser()
+parser = ArgumentParser()

 # Output verbosity options.
-optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                action='store_const', dest='loglevel',
-                const=logging.ERROR, default=logging.INFO)
-optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                action='store_const', dest='loglevel',
-                const=logging.DEBUG, default=logging.INFO)
-optp.add_option('-v', '--verbose', help='set logging to COMM',
-                action='store_const', dest='loglevel',
-                const=5, default=logging.INFO)
+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.
-optp.add_option("--oldjid", dest="old_jid",
-                help="JID of the old account")
-optp.add_option("--oldpassword", dest="old_password",
-                help="password of the old account")
+parser.add_argument("--oldjid", dest="old_jid",
+                    help="JID of the old account")
+parser.add_argument("--oldpassword", dest="old_password",
+                    help="password of the old account")

-optp.add_option("--newjid", dest="new_jid",
-                help="JID of the old account")
-optp.add_option("--newpassword", dest="new_password",
-                help="password of the old account")
+parser.add_argument("--newjid", dest="new_jid",
+                    help="JID of the old account")
+parser.add_argument("--newpassword", dest="new_password",
+                    help="password of the old account")


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

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

-if opts.old_jid is None:
-    opts.old_jid = raw_input("Old JID: ")
-if opts.old_password is None:
-    opts.old_password = getpass.getpass("Old Password: ")
+if args.old_jid is None:
+    args.old_jid = input("Old JID: ")
+if args.old_password is None:
+    args.old_password = getpass("Old Password: ")

-if opts.new_jid is None:
-    opts.new_jid = raw_input("New JID: ")
-if opts.new_password is None:
-    opts.new_password = getpass.getpass("New Password: ")
+if args.new_jid is None:
+    args.new_jid = input("New JID: ")
+if args.new_password is None:
+    args.new_password = getpass("New Password: ")


-old_xmpp = sleekxmpp.ClientXMPP(opts.old_jid, opts.old_password)
+old_xmpp = slixmpp.ClientXMPP(args.old_jid, args.old_password)

 # If you are connecting to Facebook and wish to use the
 # X-FACEBOOK-PLATFORM authentication mechanism, you will need
@@ -98,7 +85,7 @@ if not roster:
    print('No roster to migrate')
    sys.exit()

-new_xmpp = sleekxmpp.ClientXMPP(opts.new_jid, opts.new_password)
+new_xmpp = slixmpp.ClientXMPP(args.new_jid, args.new_password)
 def on_session2(event):
    new_xmpp.get_roster()
    new_xmpp.send_presence()
--- a/examples/muc.py
+++ b/examples/muc.py
@@ -1,42 +1,31 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class MUCBot(sleekxmpp.ClientXMPP):
+class MUCBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that will greets those
+    A simple Slixmpp bot that will greets those
    who enter the room, and acknowledge any messages
    that mentions the bot's nickname.
    """

    def __init__(self, jid, password, room, nick):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        self.room = room
        self.nick = nick
@@ -132,62 +121,49 @@ class MUCBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-r", "--room", dest="room",
-                    help="MUC room to join")
-    optp.add_option("-n", "--nick", dest="nick",
-                    help="MUC nickname")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-r", "--room", dest="room",
+                        help="MUC room to join")
+    parser.add_argument("-n", "--nick", dest="nick",
+                        help="MUC nickname")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.room is None:
-        opts.room = raw_input("MUC room: ")
-    if opts.nick is None:
-        opts.nick = raw_input("MUC nickname: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.room is None:
+        args.room = input("MUC room: ")
+    if args.nick is None:
+        args.nick = input("MUC nickname: ")

    # Setup the MUCBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = MUCBot(opts.jid, opts.password, opts.room, opts.nick)
+    xmpp = MUCBot(args.jid, args.password, args.room, args.nick)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0045') # Multi-User Chat
    xmpp.register_plugin('xep_0199') # XMPP Ping

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/ping.py
+++ b/examples/ping.py
@@ -1,41 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class PingTest(sleekxmpp.ClientXMPP):
+class PingTest(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that will send a ping request
+    A simple Slixmpp bot that will send a ping request
    to a given JID.
    """

    def __init__(self, jid, password, pingjid):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)
        if pingjid is None:
            pingjid = self.boundjid.bare
        self.pingjid = pingjid
@@ -45,7 +34,7 @@ class PingTest(sleekxmpp.ClientXMPP):
        # 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, threaded=True)
+        self.add_event_handler("session_start", self.start)

    def start(self, event):
        """
@@ -79,65 +68,45 @@ class PingTest(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
-    optp.add_option('-t', '--pingto', help='set jid to ping',
-                    action='store', type='string', dest='pingjid',
-                    default=None)
+    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)
+    parser.add_argument("-t", "--pingto", help="set jid to ping",
+                        action="store", type="string", dest="pingjid",
+                        default=None)

    # JID and password options.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

    # Setup the PingTest and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = PingTest(opts.jid, opts.password, opts.pingjid)
+    xmpp = PingTest(args.jid, args.password, args.pingjid)
    xmpp.register_plugin('xep_0030')  # Service Discovery
    xmpp.register_plugin('xep_0004')  # Data Forms
    xmpp.register_plugin('xep_0060')  # PubSub
    xmpp.register_plugin('xep_0199')  # XMPP Ping

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/proxy_echo_client.py
+++ b/examples/proxy_echo_client.py
@@ -1,41 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class EchoBot(sleekxmpp.ClientXMPP):
+class EchoBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that will echo messages it
+    A simple Slixmpp bot that will echo messages it
    receives, along with a short thank you message.
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__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
@@ -82,87 +71,65 @@ class EchoBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("--phost", dest="proxy_host",
-                    help="Proxy hostname")
-    optp.add_option("--pport", dest="proxy_port",
-                    help="Proxy port")
-    optp.add_option("--puser", dest="proxy_user",
-                    help="Proxy username")
-    optp.add_option("--ppass", dest="proxy_pass",
-                    help="Proxy password")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("--phost", dest="proxy_host",
+                        help="Proxy hostname")
+    parser.add_argument("--pport", dest="proxy_port",
+                        help="Proxy port")
+    parser.add_argument("--puser", dest="proxy_user",
+                        help="Proxy username")
+    parser.add_argument("--ppass", dest="proxy_pass",
+                        help="Proxy password")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.proxy_host is None:
-        opts.proxy_host = raw_input("Proxy host: ")
-    if opts.proxy_port is None:
-        opts.proxy_port = raw_input("Proxy port: ")
-    if opts.proxy_user is None:
-        opts.proxy_user = raw_input("Proxy username: ")
-    if opts.proxy_pass is None and opts.proxy_user:
-        opts.proxy_pass = getpass.getpass("Proxy password: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.proxy_host is None:
+        args.proxy_host = input("Proxy host: ")
+    if args.proxy_port is None:
+        args.proxy_port = input("Proxy port: ")
+    if args.proxy_user is None:
+        args.proxy_user = input("Proxy username: ")
+    if args.proxy_pass is None and args.proxy_user:
+        args.proxy_pass = getpass("Proxy 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(opts.jid, opts.password)
+    xmpp = EchoBot(args.jid, args.password)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0060') # PubSub
    xmpp.register_plugin('xep_0199') # XMPP Ping

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    xmpp.use_proxy = True
    xmpp.proxy_config = {
-        'host': opts.proxy_host,
-        'port': int(opts.proxy_port),
-        'username': opts.proxy_user,
-        'password': opts.proxy_pass}
+        'host': args.proxy_host,
+        'port': int(args.proxy_port),
+        'username': args.proxy_user,
+        'password': args.proxy_pass}

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/pubsub_client.py
+++ b/examples/pubsub_client.py
@@ -1,27 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

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

-import sleekxmpp
-from sleekxmpp.xmlstream import ET, tostring
+import slixmpp
+from slixmpp.xmlstream import ET, tostring


-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
-
-
-class PubsubClient(sleekxmpp.ClientXMPP):
+class PubsubClient(slixmpp.ClientXMPP):

    def __init__(self, jid, password, server,
                       node=None, action='list', data=''):
@@ -40,7 +28,7 @@ class PubsubClient(sleekxmpp.ClientXMPP):
        self.data = data
        self.pubsub_server = server

-        self.add_event_handler('session_start', self.start, threaded=True)
+        self.add_event_handler('session_start', self.start)

    def start(self, event):
        self.get_roster()
@@ -123,79 +111,52 @@ class PubsubClient(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
-    optp.version = '%%prog 0.1'
-    optp.usage = "Usage: %%prog [options] <jid> " + \
+    parser = ArgumentParser()
+    parser.version = '%%prog 0.1'
+    parser.usage = "Usage: %%prog [options] <jid> " + \
                             'nodes|create|delete|purge|subscribe|unsubscribe|publish|retract|get' + \
                             ' [<node> <data>]'

-    optp.add_option('-q','--quiet', help='set logging to ERROR',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.ERROR,
-                    default=logging.ERROR)
-    optp.add_option('-d','--debug', help='set logging to DEBUG',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.DEBUG,
-                    default=logging.ERROR)
-    optp.add_option('-v','--verbose', help='set logging to COMM',
-                    action='store_const',
-                    dest='loglevel',
-                    const=5,
-                    default=logging.ERROR)
+    parser.add_argument("-q","--quiet", help="set logging to ERROR",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.ERROR,
+                        default=logging.ERROR)
+    parser.add_argument("-d","--debug", help="set logging to DEBUG",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.DEBUG,
+                        default=logging.ERROR)

    # JID and password options.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    opts,args = optp.parse_args()
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+
+    parser.add_argument("server")
+    parser.add_argument("action", choice=["nodes", "create", "delete", "purge", "subscribe", "unsubscribe", "publish", "retract", "get"])
+    parser.add_argument("node", nargs='?')
+    parser.add_argument("data", nargs='?')
+
+    args = parser.parse_args()

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

-    if len(args) < 2:
-        optp.print_help()
-        exit()
-
-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-
-    if len(args) == 2:
-        args = (args[0], args[1], '', '', '')
-    elif len(args) == 3:
-        args = (args[0], args[1], args[2], '', '')
-    elif len(args) == 4:
-        args = (args[0], args[1], args[2], args[3], '')
-
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")

    # Setup the Pubsub client
-    xmpp = PubsubClient(opts.jid, opts.password,
-                        server=args[0],
-                        node=args[2],
-                        action=args[1],
-                        data=args[3])
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
+    xmpp = PubsubClient(args.jid, args.password,
+                        server=args.server,
+                        node=args.node,
+                        action=args.action,
+                        data=args.data)

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/pubsub_events.py
+++ b/examples/pubsub_events.py
@@ -1,29 +1,17 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

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

-import sleekxmpp
-from sleekxmpp.xmlstream import ET, tostring
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream.handler import Callback
+import slixmpp
+from slixmpp.xmlstream import ET, tostring
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream.handler import Callback


-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
-
-
-class PubsubEvents(sleekxmpp.ClientXMPP):
+class PubsubEvents(slixmpp.ClientXMPP):

    def __init__(self, jid, password):
        super(PubsubEvents, self).__init__(jid, password)
@@ -96,59 +84,39 @@ class PubsubEvents(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

    logging.info("Run this in conjunction with the pubsub_client.py " + \
                 "example to watch events happen as you give commands.")

    # Setup the PubsubEvents listener
-    xmpp = PubsubEvents(opts.jid, opts.password)
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
+    xmpp = PubsubEvents(args.jid, args.password)

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/register_account.py
+++ b/examples/register_account.py
@@ -1,34 +1,23 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-from sleekxmpp.exceptions import IqError, IqTimeout
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp
+from slixmpp.exceptions import IqError, IqTimeout


-class RegisterBot(sleekxmpp.ClientXMPP):
+class RegisterBot(slixmpp.ClientXMPP):

    """
    A basic bot that will attempt to register an account
@@ -40,23 +29,23 @@ class RegisterBot(sleekxmpp.ClientXMPP):
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__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, threaded=True)
+        self.add_event_handler("session_start", self.start)

        # The register event provides an Iq result stanza with
        # a registration form from the server. This may include
        # the basic registration fields, a data form, an
        # out-of-band URL, or any combination. For more advanced
        # cases, you will need to examine the fields provided
-        # and respond accordingly. SleekXMPP provides plugins
+        # and respond accordingly. Slixmpp provides plugins
        # for data forms and OOB links that will make that easier.
-        self.add_event_handler("register", self.register, threaded=True)
+        self.add_event_handler("register", self.register)

    def start(self, event):
        """
@@ -101,7 +90,7 @@ class RegisterBot(sleekxmpp.ClientXMPP):
        resp['register']['password'] = self.password

        try:
-            resp.send(now=True)
+            resp.send()
            logging.info("Account created for %s!" % self.boundjid)
        except IqError as e:
            logging.error("Could not register account: %s" %
@@ -114,40 +103,37 @@ class RegisterBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

    # Setup the RegisterBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = RegisterBot(opts.jid, opts.password)
+    xmpp = RegisterBot(args.jid, args.password)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data forms
    xmpp.register_plugin('xep_0066') # Out-of-band Data
@@ -157,23 +143,6 @@ if __name__ == '__main__':
    # though they allow it. If this applies to your server, use:
    xmpp['xep_0077'].force_registration = True

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/roster_browser.py
+++ b/examples/roster_browser.py
@@ -1,36 +1,24 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2011  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-from sleekxmpp.exceptions import IqError, IqTimeout
+import slixmpp
+from slixmpp.exceptions import IqError, IqTimeout


-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
-
-
-class RosterBrowser(sleekxmpp.ClientXMPP):
+class RosterBrowser(slixmpp.ClientXMPP):

    """
    A basic script for dumping a client's roster to
@@ -38,15 +26,13 @@ class RosterBrowser(sleekxmpp.ClientXMPP):
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__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. We need threaded=True so that the
-        # session_start handler doesn't block event processing
-        # while we wait for presence stanzas to arrive.
-        self.add_event_handler("session_start", self.start, threaded=True)
+        # our roster.
+        self.add_event_handler("session_start", self.start)
        self.add_event_handler("changed_status", self.wait_for_presences)

        self.received = set()
@@ -115,58 +101,37 @@ class RosterBrowser(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
-    optp.add_option('-q','--quiet', help='set logging to ERROR',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.ERROR,
-                    default=logging.ERROR)
-    optp.add_option('-d','--debug', help='set logging to DEBUG',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.DEBUG,
-                    default=logging.ERROR)
-    optp.add_option('-v','--verbose', help='set logging to COMM',
-                    action='store_const',
-                    dest='loglevel',
-                    const=5,
-                    default=logging.ERROR)
+    parser = ArgumentParser()
+    parser.add_argument("-q","--quiet", help="set logging to ERROR",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.ERROR,
+                        default=logging.ERROR)
+    parser.add_argument("-d","--debug", help="set logging to DEBUG",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.DEBUG,
+                        default=logging.ERROR)

    # JID and password options.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    opts,args = optp.parse_args()
+    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=opts.loglevel,
+    logging.basicConfig(level=args.loglevel,
                        format='%(levelname)-8s %(message)s')

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

-    xmpp = RosterBrowser(opts.jid, opts.password)
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
+    xmpp = RosterBrowser(args.jid, args.password)

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-    else:
-        print("Unable to connect.")
-
+    xmpp.connect()
+    xmpp.process()
--- a/examples/rpc_async.py
+++ b/examples/rpc_async.py
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2011  Dann Martens
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

-from sleekxmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
+from slixmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
    ANY_ALL, Future
 import time

--- a/examples/rpc_client_side.py
+++ b/examples/rpc_client_side.py
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2011  Dann Martens
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

-from sleekxmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
+from slixmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
    ANY_ALL
 import threading
 import time
--- a/examples/rpc_server_side.py
+++ b/examples/rpc_server_side.py
@@ -1,15 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2011  Dann Martens
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

-from sleekxmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
+from slixmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
    ANY_ALL
 import threading

--- a/examples/send_client.py
+++ b/examples/send_client.py
@@ -1,41 +1,30 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

-import sleekxmpp
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp


-class SendMsgBot(sleekxmpp.ClientXMPP):
+class SendMsgBot(slixmpp.ClientXMPP):

    """
-    A basic SleekXMPP bot that will log in, send a message,
+    A basic Slixmpp bot that will log in, send a message,
    and then log out.
    """

    def __init__(self, jid, password, recipient, message):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        # The message we wish to send, and the JID that
        # will receive it.
@@ -47,7 +36,7 @@ class SendMsgBot(sleekxmpp.ClientXMPP):
        # 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, threaded=True)
+        self.add_event_handler("session_start", self.start)

    def start(self, event):
        """
@@ -69,75 +58,53 @@ class SendMsgBot(sleekxmpp.ClientXMPP):
                          mbody=self.msg,
                          mtype='chat')

-        # Using wait=True ensures that the send queue will be
-        # emptied before ending the session.
-        self.disconnect(wait=True)
+        self.disconnect()


 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser(description=SendMsgBot.__doc__)

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-t", "--to", dest="to",
-                    help="JID to send the message to")
-    optp.add_option("-m", "--message", dest="message",
-                    help="message to send")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-t", "--to", dest="to",
+                        help="JID to send the message to")
+    parser.add_argument("-m", "--message", dest="message",
+                        help="message to send")

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

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.to is None:
-        opts.to = raw_input("Send To: ")
-    if opts.message is None:
-        opts.message = raw_input("Message: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.to is None:
+        args.to = input("Send To: ")
+    if args.message is None:
+        args.message = input("Message: ")

    # Setup the EchoBot and register plugins. Note that while plugins may
    # have interdependencies, the order in which you register them does
    # not matter.
-    xmpp = SendMsgBot(opts.jid, opts.password, opts.to, opts.message)
+    xmpp = SendMsgBot(args.jid, args.password, args.to, args.message)
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0199') # XMPP Ping

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/set_avatar.py
+++ b/examples/set_avatar.py
@@ -1,47 +1,35 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2012  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

 import os
-import sys
 import imghdr
 import logging
-import getpass
+from getpass import getpass
 import threading
-from optparse import OptionParser
+from argparse import ArgumentParser

-import sleekxmpp
-from sleekxmpp.exceptions import XMPPError
+import slixmpp
+from slixmpp.exceptions import XMPPError


-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
-
-
-class AvatarSetter(sleekxmpp.ClientXMPP):
+class AvatarSetter(slixmpp.ClientXMPP):

    """
    A basic script for downloading the avatars for a user's contacts.
    """

    def __init__(self, jid, password, filepath):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

-        self.add_event_handler("session_start", self.start, threaded=True)
+        self.add_event_handler("session_start", self.start)

        self.filepath = filepath

@@ -111,64 +99,44 @@ class AvatarSetter(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
-    optp.add_option('-q','--quiet', help='set logging to ERROR',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.ERROR,
-                    default=logging.ERROR)
-    optp.add_option('-d','--debug', help='set logging to DEBUG',
-                    action='store_const',
-                    dest='loglevel',
-                    const=logging.DEBUG,
-                    default=logging.ERROR)
-    optp.add_option('-v','--verbose', help='set logging to COMM',
-                    action='store_const',
-                    dest='loglevel',
-                    const=5,
-                    default=logging.ERROR)
+    parser = ArgumentParser()
+    parser.add_argument("-q","--quiet", help="set logging to ERROR",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.ERROR,
+                        default=logging.ERROR)
+    parser.add_argument("-d","--debug", help="set logging to DEBUG",
+                        action="store_const",
+                        dest="loglevel",
+                        const=logging.DEBUG,
+                        default=logging.ERROR)

    # JID and password options.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
-    optp.add_option("-f", "--file", dest="filepath",
-                    help="path to the avatar file")
-    opts,args = optp.parse_args()
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")
+    parser.add_argument("-f", "--file", dest="filepath",
+                        help="path to the avatar file")
+
+    args = parser.parse_args()

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

-    if opts.jid is None:
-        opts.jid = raw_input("Username: ")
-    if opts.password is None:
-        opts.password = getpass.getpass("Password: ")
-    if opts.filepath is None:
-        opts.filepath = raw_input("Avatar file location: ")
+    if args.jid is None:
+        args.jid = input("Username: ")
+    if args.password is None:
+        args.password = getpass("Password: ")
+    if args.filepath is None:
+        args.filepath = input("Avatar file location: ")

-    xmpp = AvatarSetter(opts.jid, opts.password, opts.filepath)
+    xmpp = AvatarSetter(args.jid, args.password, args.filepath)
    xmpp.register_plugin('xep_0054')
    xmpp.register_plugin('xep_0153')
    xmpp.register_plugin('xep_0084')

-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
-
    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/thirdparty_auth.py
+++ b/examples/thirdparty_auth.py
@@ -1,18 +1,18 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-

 """
-    SleekXMPP: The Sleek XMPP Library
+    Slixmpp: The Slick XMPP Library
    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
+    This file is part of Slixmpp.

    See the file LICENSE for copying permission.
 """

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

 try:
    from httplib import HTTPSConnection
@@ -21,24 +21,14 @@ except ImportError:
    from urllib.parse import urlencode
    from http.client import HTTPSConnection

-import sleekxmpp
-from sleekxmpp.xmlstream import JID
-
-# Python versions before 3.0 do not use UTF-8 encoding
-# by default. To ensure that Unicode is handled properly
-# throughout SleekXMPP, we will set the default encoding
-# ourselves to UTF-8.
-if sys.version_info < (3, 0):
-    from sleekxmpp.util.misc_ops import setdefaultencoding
-    setdefaultencoding('utf8')
-else:
-    raw_input = input
+import slixmpp
+from slixmpp.xmlstream import JID


-class ThirdPartyAuthBot(sleekxmpp.ClientXMPP):
+class ThirdPartyAuthBot(slixmpp.ClientXMPP):

    """
-    A simple SleekXMPP bot that will echo messages it
+    A simple Slixmpp bot that will echo messages it
    receives, along with a short thank you message.

    This version uses a thirdpary service for authentication,
@@ -46,7 +36,7 @@ class ThirdPartyAuthBot(sleekxmpp.ClientXMPP):
    """

    def __init__(self, jid, password):
-        sleekxmpp.ClientXMPP.__init__(self, jid, password)
+        slixmpp.ClientXMPP.__init__(self, jid, password)

        # The X-GOOGLE-TOKEN mech is ranked lower than PLAIN
        # due to Google only allowing a single SASL attempt per
@@ -55,7 +45,7 @@ class ThirdPartyAuthBot(sleekxmpp.ClientXMPP):
        # X-GOOGLE-TOKEN with a TLS connection, explicitly select
        # it using:
        #
-        # sleekxmpp.ClientXMPP.__init__(self, jid, password,
+        # slixmpp.ClientXMPP.__init__(self, jid, password,
        #                               sasl_mech="X-GOOGLE-TOKEN")

        # The session_start event will be triggered when
@@ -104,37 +94,34 @@ class ThirdPartyAuthBot(sleekxmpp.ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

-    
    access_token = None

    # Since documentation on how to work with Google tokens
@@ -156,11 +143,11 @@ if __name__ == '__main__':
    params = urlencode({
        'accountType': 'GOOGLE',
        'service': 'mail',
-        'Email': JID(opts.jid).bare,
-        'Passwd': opts.password
+        'Email': JID(args.jid).bare,
+        'Passwd': args.password
    })
    headers = {
-        'Content-Type': 'application/x-www-form-urlencoded' 
+        'Content-Type': 'application/x-www-form-urlencoded'
    }
    try:
        conn.request('POST', '/accounts/ClientLogin', params, headers)
@@ -208,12 +195,12 @@ if __name__ == '__main__':
    # We're using an access token instead of a password, so we'll use `''` as
    # a password argument filler.

-    xmpp = ThirdPartyAuthBot(opts.jid, '')  
+    xmpp = ThirdPartyAuthBot(args.jid, '')
    xmpp.credentials['access_token'] = access_token

    # The credentials dictionary is used to provide additional authentication
    # information beyond just a password.
-    
+
    xmpp.register_plugin('xep_0030') # Service Discovery
    xmpp.register_plugin('xep_0004') # Data Forms
    xmpp.register_plugin('xep_0060') # PubSub
@@ -231,17 +218,7 @@ if __name__ == '__main__':
    # xmpp.ca_certs = "path/to/ca/cert"

    # Connect to the XMPP server and start processing XMPP stanzas.
-    # Google only allows one SASL attempt per connection, so in order to 
+    # Google only allows one SASL attempt per connection, so in order to
    # enable the X-GOOGLE-TOKEN mechanism, we'll disable TLS.
-    if xmpp.connect(use_tls=False):
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/user_location.py
+++ b/examples/user_location.py
@@ -1,9 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3

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

 try:
    import json
@@ -16,7 +16,7 @@ except ImportError:
    print('This demo requires the requests package for using HTTP.')
    sys.exit()

-from sleekxmpp import ClientXMPP
+from slixmpp import ClientXMPP


 class LocationBot(ClientXMPP):
@@ -24,8 +24,8 @@ class LocationBot(ClientXMPP):
    def __init__(self, jid, password):
        super(LocationBot, self).__init__(jid, password)

-        self.add_event_handler('session_start', self.start, threaded=True)
-        self.add_event_handler('user_location_publish', 
+        self.add_event_handler('session_start', self.start)
+        self.add_event_handler('user_location_publish',
                               self.user_location_publish)

        self.register_plugin('xep_0004')
@@ -71,55 +71,35 @@ class LocationBot(ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

-    xmpp = LocationBot(opts.jid, opts.password)
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
+    xmpp = LocationBot(args.jid, args.password)

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/examples/user_tune.py
+++ b/examples/user_tune.py
@@ -1,9 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3

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

 try:
    from appscript import *
@@ -11,7 +11,7 @@ except ImportError:
    print('This demo requires the appscript package to interact with iTunes.')
    sys.exit()

-from sleekxmpp import ClientXMPP
+from slixmpp import ClientXMPP


 class TuneBot(ClientXMPP):
@@ -83,55 +83,35 @@ class TuneBot(ClientXMPP):

 if __name__ == '__main__':
    # Setup the command line arguments.
-    optp = OptionParser()
+    parser = ArgumentParser()

    # Output verbosity options.
-    optp.add_option('-q', '--quiet', help='set logging to ERROR',
-                    action='store_const', dest='loglevel',
-                    const=logging.ERROR, default=logging.INFO)
-    optp.add_option('-d', '--debug', help='set logging to DEBUG',
-                    action='store_const', dest='loglevel',
-                    const=logging.DEBUG, default=logging.INFO)
-    optp.add_option('-v', '--verbose', help='set logging to COMM',
-                    action='store_const', dest='loglevel',
-                    const=5, default=logging.INFO)
+    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.
-    optp.add_option("-j", "--jid", dest="jid",
-                    help="JID to use")
-    optp.add_option("-p", "--password", dest="password",
-                    help="password to use")
+    parser.add_argument("-j", "--jid", dest="jid",
+                        help="JID to use")
+    parser.add_argument("-p", "--password", dest="password",
+                        help="password to use")

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

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

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

-    xmpp = TuneBot(opts.jid, opts.password)
-
-    # If you are working with an OpenFire server, you may need
-    # to adjust the SSL version used:
-    # xmpp.ssl_version = ssl.PROTOCOL_SSLv3
-
-    # If you want to verify the SSL certificates offered by a server:
-    # xmpp.ca_certs = "path/to/ca/cert"
+    xmpp = TuneBot(args.jid, args.password)

    # Connect to the XMPP server and start processing XMPP stanzas.
-    if xmpp.connect():
-        # If you do not have the dnspython library installed, you will need
-        # to manually specify the name of the server if it does not match
-        # the one in the JID. For example, to use Google Talk you would
-        # need to use:
-        #
-        # if xmpp.connect(('talk.google.com', 5222)):
-        #     ...
-        xmpp.process(block=True)
-        print("Done")
-    else:
-        print("Unable to connect.")
+    xmpp.connect()
+    xmpp.process()
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,233 +0,0 @@
-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c7"
-DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
-    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
-    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
-    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
-    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
-    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
-    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
-    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
-    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
-    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
-    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
-    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
-    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
-    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
-    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
-    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
-    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
-    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
-    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
-    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
-    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
-    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
-    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
-    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
-    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
-}
-
-import sys, os
-
-def _validate_md5(egg_name, data):
-    if egg_name in md5_data:
-        from md5 import md5
-        digest = md5(data).hexdigest()
-        if digest != md5_data[egg_name]:
-            print >>sys.stderr, (
-                "md5 validation of %s failed!  (Possible download problem?)"
-                % egg_name
-            )
-            sys.exit(2)
-    return data
-
-
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, min_version=None,
-    download_delay=15
-):
-    """Automatically find/download setuptools and make it available on sys.path
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end with
-    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
-    it is not already available.  If `download_delay` is specified, it should
-    be the number of seconds that will be paused before initiating a download,
-    should one be required.  If an older version of setuptools is installed,
-    this routine will print a message to ``sys.stderr`` and raise SystemExit in
-    an attempt to abort the calling script.
-    """
-    try:
-        import setuptools
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-    except ImportError:
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
-        sys.path.insert(0, egg)
-        import setuptools; setuptools.bootstrap_install_from = egg
-
-    import pkg_resources
-    try:
-        if not min_version:
-            min_version = version
-        pkg_resources.require("setuptools>="+min_version)
-
-    except pkg_resources.VersionConflict, e:
-        # XXX could we install in a subprocess here?
-        print >>sys.stderr, (
-            "The required version of setuptools (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first.\n\n(Currently using %r)"
-        ) % (min_version, e.args[0])
-        sys.exit(2)
-
-def download_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay = 15
-):
-    """Download setuptools from a specified location and return its filename
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download attempt.
-    """
-    import urllib2, shutil
-    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
-    saveto = os.path.join(to_dir, egg_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            from distutils import log
-            if delay:
-                log.warn("""
---------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help).  I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
-   %s
-
-and place it in this directory before rerunning this script.)
---------------------------------------------------------------------------""",
-                    version, download_base, delay, url
-                ); from time import sleep; sleep(delay)
-            log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = _validate_md5(egg_name, src.read())
-            dst = open(saveto,"wb"); dst.write(data)
-        finally:
-            if src: src.close()
-            if dst: dst.close()
-    return os.path.realpath(saveto)
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-
-    try:
-        import setuptools
-    except ImportError:
-        egg = None
-        try:
-            egg = download_setuptools(version, delay=0)
-            sys.path.insert(0,egg)
-            from setuptools.command.easy_install import main
-            return main(list(argv)+[egg])   # we're done here
-        finally:
-            if egg and os.path.exists(egg):
-                os.unlink(egg)
-    else:
-        if setuptools.__version__ == '0.0.1':
-            # tell the user to uninstall obsolete version
-            use_setuptools(version)
-
-    req = "setuptools>="+version
-    import pkg_resources
-    try:
-        pkg_resources.require(req)
-    except pkg_resources.VersionConflict:
-        try:
-            from setuptools.command.easy_install import main
-        except ImportError:
-            from easy_install import main
-        main(list(argv)+[download_setuptools(delay=0)])
-        sys.exit(0) # try to force an exit
-    else:
-        if argv:
-            from setuptools.command.easy_install import main
-            main(argv)
-        else:
-            print "Setuptools version",version,"or greater has been installed."
-            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-
-
-def update_md5(filenames):
-    """Update our built-in md5 registry"""
-
-    import re
-    from md5 import md5
-
-    for name in filenames:
-        base = os.path.basename(name)
-        f = open(name,'rb')
-        md5_data[base] = md5(f.read()).hexdigest()
-        f.close()
-
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
-    data.sort()
-    repl = "".join(data)
-
-    import inspect
-    srcfile = inspect.getsourcefile(sys.modules[__name__])
-    f = open(srcfile, 'rb'); src = f.read(); f.close()
-
-    match = re.search("\nmd5_data = {\n([^}]+)}", src)
-    if not match:
-        print >>sys.stderr, "Internal error!"
-        sys.exit(2)
-
-    src = src[:match.start(1)] + repl + src[match.end(1):]
-    f = open(srcfile,'w')
-    f.write(src)
-    f.close()
-
-
-if __name__=='__main__':
-    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
-        update_md5(sys.argv[2:])
-    else:
-        main(sys.argv[1:])
-
-
-
-
-
--- a/run_tests.py
+++ b/run_tests.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+import sys
+import logging
+import unittest
+
+from argparse import ArgumentParser
+from distutils.core import Command
+from importlib import import_module
+from pathlib import Path
+
+
+def run_tests(filenames=None):
+    """
+    Find and run all tests in the tests/ directory.
+
+    Excludes live tests (tests/live_*).
+    """
+    if not filenames:
+        filenames = [i for i in Path('tests').glob('test_*')]
+    else:
+        filenames = [Path(i) for i in filenames]
+
+    modules = ['.'.join(test.parts[:-1] + (test.stem,)) for test in filenames]
+
+    suites = []
+    for filename in modules:
+        module = import_module(filename)
+        suites.append(module.suite)
+
+    tests = unittest.TestSuite(suites)
+    runner = unittest.TextTestRunner(verbosity=2)
+
+    # Disable logging output
+    logging.basicConfig(level=100)
+    logging.disable(100)
+
+    result = runner.run(tests)
+    return result
+
+
+# Add a 'test' command for setup.py
+
+class TestCommand(Command):
+
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        run_tests()
+
+
+if __name__ == '__main__':
+    parser = ArgumentParser(description='Run unit tests.')
+    parser.add_argument('tests', metavar='TEST', nargs='*', help='list of tests to run, or nothing to run them all')
+    args = parser.parse_args()
+
+    result = run_tests(args.tests)
+    print("<tests %s ran='%s' errors='%s' fails='%s' success='%s'/>" % (
+        "xmlns='http//andyet.net/protocol/tests'",
+        result.testsRun, len(result.errors),
+        len(result.failures), result.wasSuccessful()))
+
+    sys.exit(not result.wasSuccessful())
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2007-2011 Nathanael C. Fritz
@@ -7,146 +7,43 @@
 # This software is licensed as described in the README.rst and LICENSE
 # file, which you should have received as part of this distribution.

-import sys
-import codecs
+from pathlib import Path
 try:
-    from setuptools import setup, Command
+    from setuptools import setup
 except ImportError:
-    from distutils.core import setup, Command
-# from ez_setup import use_setuptools
+    from distutils.core import setup

-from testall import TestCommand
-from sleekxmpp.version import __version__
-# if 'cygwin' in sys.platform.lower():
-#     min_version = '0.6c6'
-# else:
-#     min_version = '0.6a9'
-#
-# try:
-#     use_setuptools(min_version=min_version)
-# except TypeError:
-#     # locally installed ez_setup won't have min_version
-#     use_setuptools()
-#
-# from setuptools import setup, find_packages, Extension, Feature
+from run_tests import TestCommand
+from slixmpp.version import __version__

-VERSION          = __version__
-DESCRIPTION      = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
-with codecs.open('README.rst', 'r', encoding='UTF-8') as readme:
-    LONG_DESCRIPTION = ''.join(readme)
+VERSION = __version__
+DESCRIPTION = ('Slixmpp is an elegant Python library for XMPP (aka Jabber, '
+               'Google Talk, etc).')
+with open('README.rst', encoding='utf8') as readme:
+    LONG_DESCRIPTION = readme.read()

-CLASSIFIERS      = [ 'Intended Audience :: Developers',
-                     'License :: OSI Approved :: MIT License',
-                     'Programming Language :: Python',
-                     'Programming Language :: Python :: 2.6',
-                     'Programming Language :: Python :: 2.7',
-                     'Programming Language :: Python :: 3.1',
-                     'Programming Language :: Python :: 3.2',
-                     'Programming Language :: Python :: 3.3',
-                     'Topic :: Software Development :: Libraries :: Python Modules',
-                   ]
+CLASSIFIERS = [
+    'Intended Audience :: Developers',
+    'License :: OSI Approved :: MIT License',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3.4',
+    'Topic :: Software Development :: Libraries :: Python Modules',
+]

-packages     = [ 'sleekxmpp',
-                 'sleekxmpp/stanza',
-                 'sleekxmpp/test',
-                 'sleekxmpp/roster',
-                 'sleekxmpp/util',
-                 'sleekxmpp/util/sasl',
-                 'sleekxmpp/xmlstream',
-                 'sleekxmpp/xmlstream/matcher',
-                 'sleekxmpp/xmlstream/handler',
-                 'sleekxmpp/plugins',
-                 'sleekxmpp/plugins/xep_0004',
-                 'sleekxmpp/plugins/xep_0004/stanza',
-                 'sleekxmpp/plugins/xep_0009',
-                 'sleekxmpp/plugins/xep_0009/stanza',
-                 'sleekxmpp/plugins/xep_0012',
-                 'sleekxmpp/plugins/xep_0013',
-                 'sleekxmpp/plugins/xep_0016',
-                 'sleekxmpp/plugins/xep_0020',
-                 'sleekxmpp/plugins/xep_0027',
-                 'sleekxmpp/plugins/xep_0030',
-                 'sleekxmpp/plugins/xep_0030/stanza',
-                 'sleekxmpp/plugins/xep_0033',
-                 'sleekxmpp/plugins/xep_0047',
-                 'sleekxmpp/plugins/xep_0048',
-                 'sleekxmpp/plugins/xep_0049',
-                 'sleekxmpp/plugins/xep_0050',
-                 'sleekxmpp/plugins/xep_0054',
-                 'sleekxmpp/plugins/xep_0059',
-                 'sleekxmpp/plugins/xep_0060',
-                 'sleekxmpp/plugins/xep_0060/stanza',
-                 'sleekxmpp/plugins/xep_0065',
-                 'sleekxmpp/plugins/xep_0066',
-                 'sleekxmpp/plugins/xep_0071',
-                 'sleekxmpp/plugins/xep_0077',
-                 'sleekxmpp/plugins/xep_0078',
-                 'sleekxmpp/plugins/xep_0080',
-                 'sleekxmpp/plugins/xep_0084',
-                 'sleekxmpp/plugins/xep_0085',
-                 'sleekxmpp/plugins/xep_0086',
-                 'sleekxmpp/plugins/xep_0091',
-                 'sleekxmpp/plugins/xep_0092',
-		 'sleekxmpp/plugins/xep_0095',
-		 'sleekxmpp/plugins/xep_0096',
-                 'sleekxmpp/plugins/xep_0107',
-                 'sleekxmpp/plugins/xep_0108',
-                 'sleekxmpp/plugins/xep_0115',
-                 'sleekxmpp/plugins/xep_0118',
-                 'sleekxmpp/plugins/xep_0128',
-                 'sleekxmpp/plugins/xep_0131',
-                 'sleekxmpp/plugins/xep_0152',
-                 'sleekxmpp/plugins/xep_0153',
-                 'sleekxmpp/plugins/xep_0172',
-                 'sleekxmpp/plugins/xep_0184',
-                 'sleekxmpp/plugins/xep_0186',
-                 'sleekxmpp/plugins/xep_0191',
-                 'sleekxmpp/plugins/xep_0196',
-                 'sleekxmpp/plugins/xep_0198',
-                 'sleekxmpp/plugins/xep_0199',
-                 'sleekxmpp/plugins/xep_0202',
-                 'sleekxmpp/plugins/xep_0203',
-                 'sleekxmpp/plugins/xep_0221',
-                 'sleekxmpp/plugins/xep_0224',
-                 'sleekxmpp/plugins/xep_0231',
-                 'sleekxmpp/plugins/xep_0235',
-                 'sleekxmpp/plugins/xep_0249',
-                 'sleekxmpp/plugins/xep_0257',
-                 'sleekxmpp/plugins/xep_0258',
-                 'sleekxmpp/plugins/xep_0279',
-                 'sleekxmpp/plugins/xep_0280',
-                 'sleekxmpp/plugins/xep_0297',
-                 'sleekxmpp/plugins/xep_0308',
-                 'sleekxmpp/plugins/xep_0313',
-                 'sleekxmpp/plugins/xep_0319',
-                 'sleekxmpp/plugins/google',
-                 'sleekxmpp/plugins/google/gmail',
-                 'sleekxmpp/plugins/google/auth',
-                 'sleekxmpp/plugins/google/settings',
-                 'sleekxmpp/plugins/google/nosave',
-                 'sleekxmpp/features',
-                 'sleekxmpp/features/feature_mechanisms',
-                 'sleekxmpp/features/feature_mechanisms/stanza',
-                 'sleekxmpp/features/feature_starttls',
-                 'sleekxmpp/features/feature_bind',
-                 'sleekxmpp/features/feature_session',
-                 'sleekxmpp/features/feature_rosterver',
-                 'sleekxmpp/features/feature_preapproval',
-                 'sleekxmpp/thirdparty',
-                 ]
+packages = [str(mod.parent) for mod in Path('slixmpp').rglob('__init__.py')]

 setup(
-    name             = "sleekxmpp",
-    version          = VERSION,
-    description      = DESCRIPTION,
-    long_description = LONG_DESCRIPTION,
-    author       = 'Nathanael Fritz',
-    author_email = 'fritzy [at] netflint.net',
-    url          = 'http://github.com/fritzy/SleekXMPP',
-    license      = 'MIT',
-    platforms    = [ 'any' ],
-    packages     = packages,
-    requires     = [ 'dnspython', 'pyasn1', 'pyasn1_modules' ],
-    classifiers  = CLASSIFIERS,
-    cmdclass     = {'test': TestCommand}
+    name="slixmpp",
+    version=VERSION,
+    description=DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    author='Florent Le Coz',
+    author_email='louiz@louiz.org',
+    url='https://dev.louiz.org/projects/slixmpp',
+    license='MIT',
+    platforms=['any'],
+    packages=packages,
+    requires=['aiodns', 'pyasn1', 'pyasn1_modules'],
+    classifiers=CLASSIFIERS,
+    cmdclass={'test': TestCommand}
 )
--- a/sleekxmpp/init.py
+++ b/sleekxmpp/init.py
@@ -1,30 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2010  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-if hasattr(logging, 'NullHandler'):
-    NullHandler = logging.NullHandler
-else:
-    class NullHandler(logging.Handler):
-        def handle(self, record):
-            pass
-logging.getLogger(__name__).addHandler(NullHandler())
-del NullHandler
-
-
-from sleekxmpp.stanza import Message, Presence, Iq
-from sleekxmpp.jid import JID, InvalidJID
-from sleekxmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin
-from sleekxmpp.xmlstream.handler import *
-from sleekxmpp.xmlstream import XMLStream, RestartStream
-from sleekxmpp.xmlstream.matcher import *
-from sleekxmpp.basexmpp import BaseXMPP
-from sleekxmpp.clientxmpp import ClientXMPP
-from sleekxmpp.componentxmpp import ComponentXMPP
-
-from sleekxmpp.version import __version__, __version_info__
--- a/sleekxmpp/features/feature_bind/init.py
+++ b/sleekxmpp/features/feature_bind/init.py
@@ -1,19 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.features.feature_bind.bind import FeatureBind
-from sleekxmpp.features.feature_bind.stanza import Bind
-
-
-register_plugin(FeatureBind)
-
-
-# Retain some backwards compatibility
-feature_bind = FeatureBind
--- a/sleekxmpp/features/feature_mechanisms/init.py
+++ b/sleekxmpp/features/feature_mechanisms/init.py
@@ -1,22 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.features.feature_mechanisms.mechanisms import FeatureMechanisms
-from sleekxmpp.features.feature_mechanisms.stanza import Mechanisms
-from sleekxmpp.features.feature_mechanisms.stanza import Auth
-from sleekxmpp.features.feature_mechanisms.stanza import Success
-from sleekxmpp.features.feature_mechanisms.stanza import Failure
-
-
-register_plugin(FeatureMechanisms)
-
-
-# Retain some backwards compatibility
-feature_mechanisms = FeatureMechanisms
--- a/sleekxmpp/features/feature_mechanisms/stanza/init.py
+++ b/sleekxmpp/features/feature_mechanisms/stanza/init.py
@@ -1,16 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-
-from sleekxmpp.features.feature_mechanisms.stanza.mechanisms import Mechanisms
-from sleekxmpp.features.feature_mechanisms.stanza.auth import Auth
-from sleekxmpp.features.feature_mechanisms.stanza.success import Success
-from sleekxmpp.features.feature_mechanisms.stanza.failure import Failure
-from sleekxmpp.features.feature_mechanisms.stanza.challenge import Challenge
-from sleekxmpp.features.feature_mechanisms.stanza.response import Response
-from sleekxmpp.features.feature_mechanisms.stanza.abort import Abort
--- a/sleekxmpp/features/feature_preapproval/init.py
+++ b/sleekxmpp/features/feature_preapproval/init.py
@@ -1,15 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2012  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.features.feature_preapproval.preapproval import FeaturePreApproval
-from sleekxmpp.features.feature_preapproval.stanza import PreApproval
-
-
-register_plugin(FeaturePreApproval)
--- a/sleekxmpp/features/feature_rosterver/init.py
+++ b/sleekxmpp/features/feature_rosterver/init.py
@@ -1,19 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2012  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.features.feature_rosterver.rosterver import FeatureRosterVer
-from sleekxmpp.features.feature_rosterver.stanza import RosterVer
-
-
-register_plugin(FeatureRosterVer)
-
-
-# Retain some backwards compatibility
-feature_rosterver = FeatureRosterVer
--- a/sleekxmpp/features/feature_session/init.py
+++ b/sleekxmpp/features/feature_session/init.py
@@ -1,19 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.features.feature_session.session import FeatureSession
-from sleekxmpp.features.feature_session.stanza import Session
-
-
-register_plugin(FeatureSession)
-
-
-# Retain some backwards compatibility
-feature_session = FeatureSession
--- a/sleekxmpp/features/feature_starttls/init.py
+++ b/sleekxmpp/features/feature_starttls/init.py
@@ -1,19 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011  Nathanael C. Fritz
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.features.feature_starttls.starttls import FeatureSTARTTLS
-from sleekxmpp.features.feature_starttls.stanza import *
-
-
-register_plugin(FeatureSTARTTLS)
-
-
-# Retain some backwards compatibility
-feature_starttls = FeatureSTARTTLS
--- a/sleekxmpp/plugins/google/init.py
+++ b/sleekxmpp/plugins/google/init.py
@@ -1,47 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin, BasePlugin
-
-from sleekxmpp.plugins.google.gmail import Gmail
-from sleekxmpp.plugins.google.auth import GoogleAuth
-from sleekxmpp.plugins.google.settings import GoogleSettings
-from sleekxmpp.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/sleekxmpp/plugins/google/auth/init.py
+++ b/sleekxmpp/plugins/google/auth/init.py
@@ -1,10 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.google.auth import stanza
-from sleekxmpp.plugins.google.auth.auth import GoogleAuth
--- a/sleekxmpp/plugins/google/auth/auth.py
+++ b/sleekxmpp/plugins/google/auth/auth.py
@@ -1,52 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.google.auth import stanza
-
-
-log = logging.getLogger(__name__)
-
-
-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/sleekxmpp/plugins/google/auth/stanza.py
+++ b/sleekxmpp/plugins/google/auth/stanza.py
@@ -1,49 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.xmlstream import ElementBase, ET
-
-
-class GoogleAuth(ElementBase):
-    name = 'auth'
-    namespace = 'http://www.google.com/talk/protocol/auth'
-    plugin_attrib = 'google'
-    interfaces = set(['client_uses_full_bind_result', 'service'])
-
-    discovery_attr= '{%s}client-uses-full-bind-result' % namespace
-    service_attr= '{%s}service' % namespace
-
-    def setup(self, xml):
-        """Don't create XML for the plugin."""
-        self.xml = ET.Element('')
-        print('setting up google extension')
-
-    def get_client_uses_full_bind_result(self):
-        return self.parent()._get_attr(self.disovery_attr) == 'true'
-
-    def set_client_uses_full_bind_result(self, value):
-        print('>>>', value)
-        if value in (True, 'true'):
-            self.parent()._set_attr(self.discovery_attr, 'true')
-        else:
-            self.parent()._del_attr(self.discovery_attr)
-
-    def del_client_uses_full_bind_result(self):
-        self.parent()._del_attr(self.discovery_attr)
-
-    def get_service(self):
-        return self.parent()._get_attr(self.service_attr, '')
-
-    def set_service(self, value):
-        if value:
-            self.parent()._set_attr(self.service_attr, value)
-        else:
-            self.parent()._del_attr(self.service_attr)
-
-    def del_service(self):
-        self.parent()._del_attr(self.service_attr)
--- a/sleekxmpp/plugins/google/gmail/init.py
+++ b/sleekxmpp/plugins/google/gmail/init.py
@@ -1,10 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.google.gmail import stanza
-from sleekxmpp.plugins.google.gmail.notifications import Gmail
--- a/sleekxmpp/plugins/google/gmail/notifications.py
+++ b/sleekxmpp/plugins/google/gmail/notifications.py
@@ -1,96 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-
-from sleekxmpp.stanza import Iq
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.google.gmail import stanza
-
-
-log = logging.getLogger(__name__)
-
-
-class Gmail(BasePlugin):
-
-    """
-    Google: Gmail Notifications
-
-    Also see <https://developers.google.com/talk/jep_extensions/gmail>.
-    """
-
-    name = 'gmail'
-    description = 'Google: Gmail Notifications'
-    dependencies = set()
-    stanza = stanza
-
-    def plugin_init(self):
-        register_stanza_plugin(Iq, stanza.GmailQuery)
-        register_stanza_plugin(Iq, stanza.MailBox)
-        register_stanza_plugin(Iq, stanza.NewMail)
-
-        self.xmpp.register_handler(
-                Callback('Gmail New Mail',
-                    MatchXPath('{%s}iq/{%s}%s' % (
-                        self.xmpp.default_ns,
-                        stanza.NewMail.namespace,
-                        stanza.NewMail.name)),
-                    self._handle_new_mail))
-
-        self._last_result_time = None
-        self._last_result_tid = None
-
-    def plugin_end(self):
-        self.xmpp.remove_handler('Gmail New Mail')
-
-    def _handle_new_mail(self, iq):
-        log.info('Gmail: New email!')
-        iq.reply().send()
-        self.xmpp.event('gmail_notification')
-
-    def check(self, block=True, timeout=None, callback=None):
-        last_time = self._last_result_time
-        last_tid = self._last_result_tid
-
-        if not block:
-            callback = lambda iq: self._update_last_results(iq, callback)
-
-        resp = self.search(newer_time=last_time,
-            newer_tid=last_tid,
-            block=block,
-            timeout=timeout,
-            callback=callback)
-
-        if block:
-            self._update_last_results(resp)
-            return resp
-
-    def _update_last_results(self, iq, callback=None):
-        self._last_result_time = data['gmail_messages']['result_time']
-        threads = data['gmail_messages']['threads']
-        if threads:
-            self._last_result_tid = threads[0]['tid']
-        if callback:
-            callback(iq)
-
-    def search(self, query=None, newer_time=None, newer_tid=None, block=True,
-                     timeout=None, callback=None):
-        if not query:
-            log.info('Gmail: Checking for new email')
-        else:
-            log.info('Gmail: Searching for emails matching: "%s"', query)
-        iq = self.xmpp.Iq()
-        iq['type'] = 'get'
-        iq['to'] = self.xmpp.boundjid.bare
-        iq['gmail']['search'] = query
-        iq['gmail']['newer_than_time'] = newer_time
-        iq['gmail']['newer_than_tid'] = newer_tid
-        return iq.send(block=block, timeout=timeout, callback=callback)
--- a/sleekxmpp/plugins/google/gmail/stanza.py
+++ b/sleekxmpp/plugins/google/gmail/stanza.py
@@ -1,101 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.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/sleekxmpp/plugins/google/nosave/init.py
+++ b/sleekxmpp/plugins/google/nosave/init.py
@@ -1,10 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.google.nosave import stanza
-from sleekxmpp.plugins.google.nosave.nosave import GoogleNoSave
--- a/sleekxmpp/plugins/google/nosave/nosave.py
+++ b/sleekxmpp/plugins/google/nosave/nosave.py
@@ -1,83 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-
-from sleekxmpp.stanza import Iq, Message
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.google.nosave import stanza
-
-
-log = logging.getLogger(__name__)
-
-
-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, block=True, timeout=None, callback=None):
-        if jid is None:
-            self.xmpp['google_settings'].update({'archiving_enabled': False},
-                    block=block, 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(block=block, timeout=timeout, callback=callback)
-
-    def disable(self, jid=None, block=True, timeout=None, callback=None):
-        if jid is None:
-            self.xmpp['google_settings'].update({'archiving_enabled': True},
-                    block=block, 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(block=block, timeout=timeout, callback=callback)
-
-    def get(self, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'get'
-        iq.enable('google_nosave')
-        return iq.send(block=block, 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/sleekxmpp/plugins/google/nosave/stanza.py
+++ b/sleekxmpp/plugins/google/nosave/stanza.py
@@ -1,59 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
-
-
-class NoSave(ElementBase):
-    name = 'x'
-    namespace = 'google:nosave'
-    plugin_attrib = 'google_nosave'
-    interfaces = set(['value'])
-
-    def get_value(self):
-        return self._get_attr('value', '') == 'enabled'
-
-    def set_value(self, value):
-        self._set_attr('value', 'enabled' if value else 'disabled')
-
-
-class NoSaveQuery(ElementBase):
-    name = 'query'
-    namespace = 'google:nosave'
-    plugin_attrib = 'google_nosave'
-    interfaces = set()
-
-
-class Item(ElementBase):
-    name = 'item'
-    namespace = 'google:nosave'
-    plugin_attrib = 'item'
-    plugin_multi_attrib = 'items'
-    interfaces = set(['jid', 'source', 'value'])
-
-    def get_value(self):
-        return self._get_attr('value', '') == 'enabled'
-
-    def set_value(self, value):
-        self._set_attr('value', 'enabled' if value else 'disabled')
-
-    def get_jid(self):
-        return JID(self._get_attr('jid', ''))
-
-    def set_jid(self, value):
-        self._set_attr('jid', str(value))
-
-    def get_source(self):
-        return JID(self._get_attr('source', ''))
-
-    def set_source(self):
-        self._set_attr('source', str(value))
-
-
-register_stanza_plugin(NoSaveQuery, Item)
--- a/sleekxmpp/plugins/google/settings/init.py
+++ b/sleekxmpp/plugins/google/settings/init.py
@@ -1,10 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.google.settings import stanza
-from sleekxmpp.plugins.google.settings.settings import GoogleSettings
--- a/sleekxmpp/plugins/google/settings/settings.py
+++ b/sleekxmpp/plugins/google/settings/settings.py
@@ -1,65 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-import logging
-
-from sleekxmpp.stanza import Iq
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.google.settings import stanza
-
-
-class GoogleSettings(BasePlugin):
-
-    """
-    Google: Gmail Notifications
-
-    Also see <https://developers.google.com/talk/jep_extensions/usersettings>.
-    """
-
-    name = 'google_settings'
-    description = 'Google: User Settings'
-    dependencies = set()
-    stanza = stanza
-
-    def plugin_init(self):
-        register_stanza_plugin(Iq, stanza.UserSettings)
-
-        self.xmpp.register_handler(
-                Callback('Google Settings',
-                    StanzaPath('iq@type=set/google_settings'),
-                    self._handle_settings_change))
-
-    def plugin_end(self):
-        self.xmpp.remove_handler('Google Settings')
-
-    def get(self, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'get'
-        iq.enable('google_settings')
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def update(self, settings, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'set'
-        iq.enable('google_settings')
-
-        for setting, value in settings.items():
-            iq['google_settings'][setting] = value
-
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def _handle_settings_change(self, iq):
-        reply = self.xmpp.Iq()
-        reply['type'] = 'result'
-        reply['id'] = iq['id']
-        reply['to'] = iq['from']
-        reply.send()
-        self.xmpp.event('google_settings_change', iq)
--- a/sleekxmpp/plugins/google/settings/stanza.py
+++ b/sleekxmpp/plugins/google/settings/stanza.py
@@ -1,110 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.xmlstream import ET, ElementBase, register_stanza_plugin
-
-
-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/sleekxmpp/plugins/xep_0004/init.py
+++ b/sleekxmpp/plugins/xep_0004/init.py
@@ -1,22 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0004.stanza import Form
-from sleekxmpp.plugins.xep_0004.stanza import FormField, FieldOption
-from sleekxmpp.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/sleekxmpp/plugins/xep_0004/stanza/init.py
+++ b/sleekxmpp/plugins/xep_0004/stanza/init.py
@@ -1,10 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.xep_0004.stanza.field import FormField, FieldOption
-from sleekxmpp.plugins.xep_0004.stanza.form import Form
--- a/sleekxmpp/plugins/xep_0009/init.py
+++ b/sleekxmpp/plugins/xep_0009/init.py
@@ -1,20 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0009 import stanza
-from sleekxmpp.plugins.xep_0009.rpc import XEP_0009
-from sleekxmpp.plugins.xep_0009.stanza import RPCQuery, MethodCall, MethodResponse
-
-
-register_plugin(XEP_0009)
-
-
-# Retain some backwards compatibility
-xep_0009 = XEP_0009
--- a/sleekxmpp/plugins/xep_0009/stanza/init.py
+++ b/sleekxmpp/plugins/xep_0009/stanza/init.py
@@ -1,9 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.xep_0009.stanza.RPC import RPCQuery, MethodCall, MethodResponse
--- a/sleekxmpp/plugins/xep_0012/init.py
+++ b/sleekxmpp/plugins/xep_0012/init.py
@@ -1,19 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0012.stanza import LastActivity
-from sleekxmpp.plugins.xep_0012.last_activity import XEP_0012
-
-
-register_plugin(XEP_0012)
-
-
-# Retain some backwards compatibility
-xep_0004 = XEP_0012
--- a/sleekxmpp/plugins/xep_0013/init.py
+++ b/sleekxmpp/plugins/xep_0013/init.py
@@ -1,15 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permissio
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0013.stanza import Offline
-from sleekxmpp.plugins.xep_0013.offline import XEP_0013
-
-
-register_plugin(XEP_0013)
--- a/sleekxmpp/plugins/xep_0016/init.py
+++ b/sleekxmpp/plugins/xep_0016/init.py
@@ -1,16 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0016 import stanza
-from sleekxmpp.plugins.xep_0016.stanza import Privacy
-from sleekxmpp.plugins.xep_0016.privacy import XEP_0016
-
-
-register_plugin(XEP_0016)
--- a/sleekxmpp/plugins/xep_0016/privacy.py
+++ b/sleekxmpp/plugins/xep_0016/privacy.py
@@ -1,110 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp import Iq
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0016 import stanza
-from sleekxmpp.plugins.xep_0016.stanza import Privacy, Item
-
-
-class XEP_0016(BasePlugin):
-
-    name = 'xep_0016'
-    description = 'XEP-0016: Privacy Lists'
-    dependencies = set(['xep_0030'])
-    stanza = stanza
-
-    def plugin_init(self):
-        register_stanza_plugin(Iq, Privacy)
-
-    def plugin_end(self):
-        self.xmpp['xep_0030'].del_feature(feature=Privacy.namespace)
-
-    def session_bind(self, jid):
-        self.xmpp['xep_0030'].add_feature(Privacy.namespace)
-
-    def get_privacy_lists(self, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'get'
-        iq.enable('privacy')
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def get_list(self, name, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'get'
-        iq['privacy']['list']['name'] = name
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def get_active(self, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'get'
-        iq['privacy'].enable('active')
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def get_default(self, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'get'
-        iq['privacy'].enable('default')
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def activate(self, name, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'set'
-        iq['privacy']['active']['name'] = name
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def deactivate(self, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'set'
-        iq['privacy'].enable('active')
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def make_default(self, name, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'set'
-        iq['privacy']['default']['name'] = name
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def remove_default(self, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'set'
-        iq['privacy'].enable('default')
-        return iq.send(block=block, timeout=timeout, callback=callback)
-
-    def edit_list(self, name, rules, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'set'
-        iq['privacy']['list']['name'] = name
-        priv_list = iq['privacy']['list']
-
-        if not rules:
-            rules = []
-
-        for rule in rules:
-            if isinstance(rule, Item):
-                priv_list.append(rule)
-                continue
-
-            priv_list.add_item(
-                rule['value'],
-                rule['action'],
-                rule['order'],
-                itype=rule.get('type', None),
-                iq=rule.get('iq', None),
-                message=rule.get('message', None),
-                presence_in=rule.get('presence_in',
-                    rule.get('presence-in', None)),
-                presence_out=rule.get('presence_out',
-                    rule.get('presence-out', None)))
-
-    def remove_list(self, name, block=True, timeout=None, callback=None):
-        iq = self.xmpp.Iq()
-        iq['type'] = 'set'
-        iq['privacy']['list']['name'] = name
-        return iq.send(block=block, timeout=timeout, callback=callback)
--- a/sleekxmpp/plugins/xep_0020/init.py
+++ b/sleekxmpp/plugins/xep_0020/init.py
@@ -1,16 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0020 import stanza
-from sleekxmpp.plugins.xep_0020.stanza import FeatureNegotiation
-from sleekxmpp.plugins.xep_0020.feature_negotiation import XEP_0020
-
-
-register_plugin(XEP_0020)
--- a/sleekxmpp/plugins/xep_0027/init.py
+++ b/sleekxmpp/plugins/xep_0027/init.py
@@ -1,15 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0027.stanza import Signed, Encrypted
-from sleekxmpp.plugins.xep_0027.gpg import XEP_0027
-
-
-register_plugin(XEP_0027)
--- a/sleekxmpp/plugins/xep_0030/init.py
+++ b/sleekxmpp/plugins/xep_0030/init.py
@@ -1,23 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0030 import stanza
-from sleekxmpp.plugins.xep_0030.stanza import DiscoInfo, DiscoItems
-from sleekxmpp.plugins.xep_0030.static import StaticDisco
-from sleekxmpp.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.getItems = XEP_0030.get_items
-XEP_0030.make_static = XEP_0030.restore_defaults
--- a/sleekxmpp/plugins/xep_0030/stanza/init.py
+++ b/sleekxmpp/plugins/xep_0030/stanza/init.py
@@ -1,10 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.xep_0030.stanza.info import DiscoInfo
-from sleekxmpp.plugins.xep_0030.stanza.items import DiscoItems
--- a/sleekxmpp/plugins/xep_0033/init.py
+++ b/sleekxmpp/plugins/xep_0033/init.py
@@ -1,20 +0,0 @@
-"""
-    SleekXMPP: The Sleek XMPP Library
-    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
-    This file is part of SleekXMPP.
-
-    See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0033 import stanza
-from sleekxmpp.plugins.xep_0033.stanza import Addresses, Address
-from sleekxmpp.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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Florent Le Coz	1207c81ab5	Do not copy the stanza before calling each handler	2015-01-03 18:42:57 +01:00
Florent Le Coz	565da65ccd	Use a deque for the idle list	2015-01-03 16:13:39 +01:00
Florent Le Coz	47fbd4cead	Delay the handling of stanza for when the process is not busy We use some dirty monkey-patching to add a idle_call() function to the asyncio module. We then use that method to handle each received stanza only when the event loop is not busy with some other IO (mainly, the standard input)	2015-01-03 06:08:03 +01:00
mathieui	1b9b4199e8	Make the ca_certs option useful again (CA-based cert validation) It was broken since the fork.	2014-12-17 19:03:49 +01:00
mathieui	b5930ca958	Bring back authentication through SASL EXTERNAL (and only update the ssl context before it gets used)	2014-12-11 19:27:13 +01:00
mathieui	423974f90d	Fix xep-0257 for slixmpp, and fix an element name	2014-12-11 14:46:52 +01:00
Florent Le Coz	5fcf08a415	Lower the timeout for each DNS resolution attempt	2014-11-14 01:13:52 +01:00
mathieui	3c06568ed5	Let loop.create_connection do its getaddrinfo coroutine if there are no dns records left/available	2014-11-12 22:22:20 +01:00
Florent Le Coz	68e35e631a	Also work without SRV records	2014-11-05 01:11:44 +01:00
mathieui	ad8c76602b	Depend on aiodns and not dnspython in the setup.py	2014-11-03 16:55:43 +01:00
Florent Le Coz	b5c98ba99e	Fix default value of dns_answers to None (instead of [])	2014-11-02 17:44:41 +01:00
mathieui	711f8dc6af	Use aiodns instead of dnspython to query DNS records	2014-11-02 17:26:29 +01:00
mathieui	5b41fb98de	Add the ssl_cert and ssl_invalid_chain back - hack the stdlib to get the peercert, remove that hack when http://bugs.python.org/issue22768 gets fixed	2014-10-30 19:51:30 +01:00
mathieui	6da625dbdb	Make the "ciphers" option work again	2014-10-30 19:51:00 +01:00
mathieui	e862c47b8b	Remove the ssl_version option, as the defaults in python3.4 are sane	2014-10-30 19:49:26 +01:00
Florent Le Coz	4a8fe56470	Something something get_stanza_values Fix something that was broken by Link Mauve	2014-10-11 21:04:28 +02:00
Emmanuel Gil Peyrot	7c3e61950d	Remove all deprecated alias in the core of slixmpp, and wherever they were used.	2014-09-28 23:58:46 +02:00
Emmanuel Gil Peyrot	61f89eef2e	Remove the now useless Queue wrapper in slixmpp.util.	2014-09-28 23:58:46 +02:00
Emmanuel Gil Peyrot	06de587ed2	Don’t check for logging.NullHandler, it got added in Python 3.1.	2014-09-28 23:58:46 +02:00
Emmanuel Gil Peyrot	49beb3ac08	Don’t set the wait time to True instead of leaving its float default, in examples.	2014-09-28 23:58:46 +02:00
Emmanuel Gil Peyrot	e1c944d723	Improve run_tests.py, allowing it to run only specific tests.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	83442b9849	Remove useless ez_setup.py file, we use setuptools in the normal setup.py instead.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	edd6ffeb01	Clean setup.py, using modern 3.4 features.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	5a8881000c	Remove support for gevent, incompatible with python3.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	70839368c1	Fix indentation in xep_0016.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	9d8a2a1a7a	Remove all trailing semicolons.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	17174016ec	Remove all trailing whitespaces.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	ed37174a2b	Always use OrderedDict from collections, and remove its implementation in slixmpp.thirdparty.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	8660148960	Move examples from the deprecated optparse to argparse, and remove the redundant -v option.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	67ca2dd0f4	Import getpass from getpass, instead of using getpass.getpass everytime.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	882f984b26	Remove (usually) useless comments in examples about OpenFire and how to verify a certificate.	2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot	6175cbcd99	Reintroduce XMLStream.process, making it run the asyncio event loop.	2014-09-01 02:47:08 +02:00
Emmanuel Gil Peyrot	476d76a533	Remove threaded from examples’ add_event_handler.	2014-09-01 02:42:45 +02:00
Emmanuel Gil Peyrot	df68bb4896	Remove raw_input usage and other python2 support in examples	2014-09-01 02:42:45 +02:00
Emmanuel Gil Peyrot	815e647c97	Set the shebang to python3 everywhere.	2014-09-01 02:42:45 +02:00
Emmanuel Gil Peyrot	ad70ffba59	Add pygments support to debug output.	2014-09-01 02:42:45 +02:00
Emmanuel Gil Peyrot	0e95015410	Remove sys.version_info checks for python2 and clean some imports.	2014-09-01 02:42:45 +02:00
Florent Le Coz	b92dac72f3	Fix saslprep for non-ascii usernames	2014-08-25 00:59:23 +02:00
Florent Le Coz	cdb9a6ff7e	Remove deprecated xmlstream/jid.py	2014-08-16 11:27:18 +02:00
Vincent Canfield	a59148dfeb	Remove google modules from setup.py file	2014-08-15 20:27:31 -07:00
Florent Le Coz	07e46837d9	Fix some more blocking iq	2014-08-01 15:02:54 +02:00
Florent Le Coz	fa21e262c7	Add the 'connecting' event	2014-08-01 04:01:31 +02:00
Florent Le Coz	93934c7992	Improve the events triggered on failed authentication Trigger failed_auth as before, once for each failed method Trigger failed_all_auth once all method failed Trigger no_auth only if we couldn’t even try one method	2014-08-01 03:16:22 +02:00
Florent Le Coz	73edd42774	Fix the connection (and a few minor things) in xmlstream	2014-07-30 17:57:57 +02:00
Florent Le Coz	ab03ad54aa	Fix the iq.send() function, and a bunch of places where it is called This is a big-and-dirty commit with a bunch of cleanup, maybe breaking a few things, and not fixing all iq.send() calls yet.	2014-07-30 17:52:59 +02:00
Florent Le Coz	2e571ac950	Remove all the google stuf	2014-07-24 01:57:20 +02:00
Florent Le Coz	6c15d65107	And that	2014-07-23 17:40:08 +02:00
Florent Le Coz	e5af0597a6	Forgot to remove that	2014-07-23 17:17:41 +02:00
Florent Le Coz	74117453b5	Cleanup how events are run, they are always direct by definition now	2014-07-23 17:01:17 +02:00
Emmanuel Gil Peyrot	5611b30022	Use ".remove()" instead of "is in" followed by ".pop()"	2014-07-22 11:16:06 +02:00
Florent Le Coz	ede9dcd18f	An other cleanup of xmlstream.py Remove some useless things (like handling signals, managing the threads, etc), add some comment to recently added/fixed methods…	2014-07-22 02:58:34 +02:00
Florent Le Coz	d3b56a5d94	Remove unused RestartStream exception	2014-07-22 02:18:48 +02:00
Florent Le Coz	f5d4334963	Remove the now useless state machine	2014-07-21 20:40:45 +02:00
Florent Le Coz	5c769632e8	Make connect(), abort() and reconnect() work All the auto_reconnect, connect_retry logic and that kind of stuf has been entirely removed.	2014-07-21 20:34:20 +02:00
Florent Le Coz	373505f483	Clean a new bunch of stuf	2014-07-21 20:32:09 +02:00
Florent Le Coz	a2cad40f91	Remove the send_thread() function, and the stop threading.event	2014-07-21 17:50:56 +02:00
Florent Le Coz	4328762076	Fix signature of init_plugins() function	2014-07-21 17:50:29 +02:00
Florent Le Coz	c2f6f07776	Make xmlstream use an asyncio loop Scheduled events, connection, TLS handshake (with STARTTLS), read and write on the socket are all done using only asyncio. A lot of threads, and thread-related (and thus useless) things still remain. This is only a first step.	2014-07-20 20:46:03 +02:00
Florent Le Coz	5ab77c7452	Rename to slixmpp	2014-07-17 14:19:04 +02:00
Lance Stout	e5582694c0	Bump to 1.3.1	2014-06-09 08:30:31 -07:00
Lance Stout	768136e493	Fix things again, this time for python3	2014-06-09 08:29:48 -07:00
Lance Stout	753cb3580e	Bump to 1.3.0	2014-06-08 20:01:07 -07:00
Lance Stout	60b050b82a	Make ssl args work in Python <=2.6.4	2014-06-08 19:59:40 -07:00
Lance Stout	ad91a8cd5e	Bring back use of dnspython for A/AAAA resolution. This is behind a use_dnspython flag, however, so it can be disabled as desired.	2014-06-08 19:51:57 -07:00
Lance Stout	02f79fc94b	Only request auto-receipts for messages with bodies	2014-06-07 20:20:42 -07:00
Lance Stout	230a73fad2	Fix own_host in ping plugin	2014-06-07 20:06:17 -07:00
Lance Stout	d94dd486fe	Merge pull request #294 from mofrank/develop Fixes log.debug message in _connect_proxy	2014-05-16 08:43:39 -07:00
Lance Stout	6ecc39b816	Merge pull request #292 from 4gra/develop Fix support for jabberd2 with GSSAPI	2014-05-16 08:43:26 -07:00
mofrank	9c240df9db	Fixes log.debug message in _connect_proxy	2014-05-16 08:49:01 -05:00
Graham	a918bf3a95	Support jabberd2 SASL with really empty response Despite http://xmpp.org/rfcs/rfc3920.html#rfc.section.6.2, jabberd version 2.2.14 cannot accept the typical "<response xmlns="urn:ietf:params:xml:ns:xmpp-sasl">=</response>". Instead it must be truly empty, so we force an empty response for this stanza only.	2014-05-14 22:32:51 +01:00
Graham	9434ae267f	support 'success' phase correctly When the GSSAPI mechanism's process() function is invoked for the third time (on success) it must not attempt further processing. Instead it should clean the context and return an empty response.	2014-05-14 22:25:09 +01:00
Graham	94187d215a	don't use the kerberos.GSSError.message attribute Replaced the reference to kerberos.GSSError.message in any raised exception, because: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6 and its natural repr is probably the most desirable output.	2014-05-14 17:47:34 +01:00
Lance Stout	ef2f5d2978	Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop	2014-04-20 18:10:22 -07:00
Lance Stout	62671e0f56	Fix using SCRAM with ejabberd	2014-04-20 18:09:20 -07:00
Lance Stout	93869f77a0	Merge pull request #285 from lovesnow/develop Fix Don't process vCard avatars for MUC occupants caused TypeError	2014-04-20 18:06:04 -07:00
Lance Stout	8282d135cc	Bump version	2014-04-20 18:05:27 -07:00
Lance Stout	9acc78c81d	Merge pull request #288 from tpltnt/develop doc typo fixed	2014-04-20 17:56:56 -07:00
tpltnt	3642469630	doc typo fixed	2014-04-19 19:12:09 +02:00
lovesnow	34cd20339c	Fix Don't process vCard avatars for MUC occupants caused TypeError	2014-02-21 10:31:04 +08:00
Lance Stout	7548f44047	Bump version	2014-02-14 13:53:25 -08:00
Lance Stout	7cf55ef695	Allow IQ processing based on only id value before the session is bound. See issue #278	2014-02-14 13:50:21 -08:00
Lance Stout	543250da13	Bump version	2014-02-09 14:39:50 -08:00
Lance Stout	69e55d7316	Merge pull request #280 from allan-simon/develop fixed setRole function,	2014-02-09 14:39:08 -08:00
Lance Stout	158411e918	Include stanza dirs	2014-02-09 14:36:36 -08:00
Lance Stout	3f873002c4	Bump minor version	2014-02-09 14:33:36 -08:00
Lance Stout	818f4e5973	Fix setup.py to include xep_0323 and xep_0325	2014-02-09 14:33:02 -08:00
Allan Simon	c8d6e512d2	fixed setRole function, the check where made against 'affiliation' values, now we do that against actual role values	2014-02-07 12:11:28 +08:00