aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Le Coz2014-07-17 12:19:04 (GMT)
committerFlorent Le Coz2014-07-17 12:19:04 (GMT)
commit5ab77c745270d7d5c016c1dc7ef2a82533a4b16e (patch)
tree259377cc666f8b9c7954fc4e7b8f7a912bcfe101
parente5582694c07236e6830c20361840360a1dde37f3 (diff)
downloadslixmpp-5ab77c745270d7d5c016c1dc7ef2a82533a4b16e.tar.gz
slixmpp-5ab77c745270d7d5c016c1dc7ef2a82533a4b16e.tar.xz
Rename to slixmpp
-rw-r--r--.gitignore2
-rw-r--r--README.rst97
-rw-r--r--docs/Makefile8
-rw-r--r--docs/api/basexmpp.rst2
-rw-r--r--docs/api/clientxmpp.rst2
-rw-r--r--docs/api/componentxmpp.rst2
-rw-r--r--docs/api/exceptions.rst2
-rw-r--r--docs/api/xmlstream/filesocket.rst2
-rw-r--r--docs/api/xmlstream/handler.rst6
-rw-r--r--docs/api/xmlstream/jid.rst2
-rw-r--r--docs/api/xmlstream/matcher.rst10
-rw-r--r--docs/api/xmlstream/scheduler.rst2
-rw-r--r--docs/api/xmlstream/stanzabase.rst14
-rw-r--r--docs/api/xmlstream/tostring.rst8
-rw-r--r--docs/api/xmlstream/xmlstream.rst2
-rw-r--r--docs/architecture.rst34
-rw-r--r--docs/conf.py12
-rw-r--r--docs/create_plugin.rst58
-rw-r--r--docs/event_index.rst124
-rw-r--r--docs/getting_started/component.rst18
-rw-r--r--docs/getting_started/echobot.rst68
-rw-r--r--docs/getting_started/iq.rst54
-rw-r--r--docs/getting_started/muc.rst24
-rw-r--r--docs/getting_started/proxy.rst6
-rw-r--r--docs/getting_started/sendlogout.rst20
-rw-r--r--docs/guide_xep_0030.rst4
-rw-r--r--docs/index.rst36
-rw-r--r--docs/make.bat4
-rw-r--r--docs/xmpp_tdg.rst20
-rwxr-xr-xexamples/IoT_TestDevice.py20
-rwxr-xr-xexamples/adhoc_provider.py16
-rwxr-xr-xexamples/adhoc_user.py16
-rwxr-xr-xexamples/admin_commands.py16
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_provider.py26
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_user.py22
-rw-r--r--examples/custom_stanzas/stanza.py8
-rwxr-xr-xexamples/disco_browser.py16
-rwxr-xr-xexamples/download_avatars.py16
-rwxr-xr-xexamples/echo_client.py16
-rwxr-xr-xexamples/echo_component.py14
-rwxr-xr-xexamples/gtalk_custom_domain.py18
-rwxr-xr-xexamples/ibb_transfer/ibb_receiver.py14
-rwxr-xr-xexamples/ibb_transfer/ibb_sender.py14
-rwxr-xr-xexamples/migrate_roster.py10
-rwxr-xr-xexamples/muc.py16
-rwxr-xr-xexamples/ping.py16
-rwxr-xr-xexamples/proxy_echo_client.py16
-rwxr-xr-xexamples/pubsub_client.py10
-rwxr-xr-xexamples/pubsub_events.py14
-rwxr-xr-xexamples/register_account.py18
-rwxr-xr-xexamples/roster_browser.py16
-rwxr-xr-xexamples/rpc_async.py6
-rwxr-xr-xexamples/rpc_client_side.py6
-rwxr-xr-xexamples/rpc_server_side.py6
-rwxr-xr-xexamples/send_client.py16
-rwxr-xr-xexamples/set_avatar.py16
-rwxr-xr-xexamples/thirdparty_auth.py20
-rwxr-xr-xexamples/user_location.py2
-rwxr-xr-xexamples/user_tune.py2
-rwxr-xr-xsetup.py190
-rw-r--r--sleekxmpp/__init__.py30
-rw-r--r--sleekxmpp/features/feature_bind/__init__.py19
-rw-r--r--sleekxmpp/features/feature_mechanisms/__init__.py22
-rw-r--r--sleekxmpp/features/feature_mechanisms/stanza/__init__.py16
-rw-r--r--sleekxmpp/features/feature_preapproval/__init__.py15
-rw-r--r--sleekxmpp/features/feature_rosterver/__init__.py19
-rw-r--r--sleekxmpp/features/feature_session/__init__.py19
-rw-r--r--sleekxmpp/features/feature_starttls/__init__.py19
-rw-r--r--sleekxmpp/plugins/google/auth/__init__.py10
-rw-r--r--sleekxmpp/plugins/google/gmail/__init__.py10
-rw-r--r--sleekxmpp/plugins/google/nosave/__init__.py10
-rw-r--r--sleekxmpp/plugins/google/settings/__init__.py10
-rw-r--r--sleekxmpp/plugins/xep_0004/__init__.py22
-rw-r--r--sleekxmpp/plugins/xep_0004/stanza/__init__.py10
-rw-r--r--sleekxmpp/plugins/xep_0009/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0009/stanza/__init__.py9
-rw-r--r--sleekxmpp/plugins/xep_0012/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0013/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0016/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0020/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0027/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0030/__init__.py23
-rw-r--r--sleekxmpp/plugins/xep_0030/stanza/__init__.py10
-rw-r--r--sleekxmpp/plugins/xep_0033/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0047/__init__.py21
-rw-r--r--sleekxmpp/plugins/xep_0048/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0049/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0050/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0054/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0059/__init__.py18
-rw-r--r--sleekxmpp/plugins/xep_0060/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0060/stanza/__init__.py12
-rw-r--r--sleekxmpp/plugins/xep_0065/__init__.py7
-rw-r--r--sleekxmpp/plugins/xep_0066/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0071/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0077/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0078/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0080/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0084/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0085/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0086/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0091/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0092/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0095/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0096/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0107/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0108/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0115/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0118/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0128/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0131/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0152/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0153/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0172/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0184/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0186/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0191/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0196/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0198/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0199/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0202/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0203/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0221/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0224/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0231/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0235/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0249/__init__.py19
-rw-r--r--sleekxmpp/plugins/xep_0257/__init__.py17
-rw-r--r--sleekxmpp/plugins/xep_0258/__init__.py18
-rw-r--r--sleekxmpp/plugins/xep_0279/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0280/__init__.py17
-rw-r--r--sleekxmpp/plugins/xep_0297/__init__.py16
-rw-r--r--sleekxmpp/plugins/xep_0308/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0313/__init__.py15
-rw-r--r--sleekxmpp/plugins/xep_0319/__init__.py16
-rw-r--r--sleekxmpp/roster/__init__.py11
-rw-r--r--sleekxmpp/stanza/__init__.py15
-rw-r--r--sleekxmpp/test/__init__.py11
-rw-r--r--sleekxmpp/thirdparty/__init__.py12
-rw-r--r--sleekxmpp/xmlstream/__init__.py19
-rw-r--r--sleekxmpp/xmlstream/handler/__init__.py15
-rw-r--r--sleekxmpp/xmlstream/jid.py5
-rw-r--r--sleekxmpp/xmlstream/matcher/__init__.py17
-rw-r--r--slixmpp/__init__.py30
-rw-r--r--slixmpp/api.py (renamed from sleekxmpp/api.py)2
-rw-r--r--slixmpp/basexmpp.py (renamed from sleekxmpp/basexmpp.py)88
-rw-r--r--slixmpp/clientxmpp.py (renamed from sleekxmpp/clientxmpp.py)26
-rw-r--r--slixmpp/componentxmpp.py (renamed from sleekxmpp/componentxmpp.py)18
-rw-r--r--slixmpp/exceptions.py (renamed from sleekxmpp/exceptions.py)12
-rw-r--r--slixmpp/features/__init__.py (renamed from sleekxmpp/features/__init__.py)4
-rw-r--r--slixmpp/features/feature_bind/__init__.py19
-rw-r--r--slixmpp/features/feature_bind/bind.py (renamed from sleekxmpp/features/feature_bind/bind.py)14
-rw-r--r--slixmpp/features/feature_bind/stanza.py (renamed from sleekxmpp/features/feature_bind/stanza.py)6
-rw-r--r--slixmpp/features/feature_mechanisms/__init__.py22
-rw-r--r--slixmpp/features/feature_mechanisms/mechanisms.py (renamed from sleekxmpp/features/feature_mechanisms/mechanisms.py)20
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/__init__.py16
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/abort.py (renamed from sleekxmpp/features/feature_mechanisms/stanza/abort.py)6
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/auth.py (renamed from sleekxmpp/features/feature_mechanisms/stanza/auth.py)8
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/challenge.py (renamed from sleekxmpp/features/feature_mechanisms/stanza/challenge.py)8
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/failure.py (renamed from sleekxmpp/features/feature_mechanisms/stanza/failure.py)6
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/mechanisms.py (renamed from sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py)6
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/response.py (renamed from sleekxmpp/features/feature_mechanisms/stanza/response.py)8
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/success.py (renamed from sleekxmpp/features/feature_mechanisms/stanza/success.py)8
-rw-r--r--slixmpp/features/feature_preapproval/__init__.py15
-rw-r--r--slixmpp/features/feature_preapproval/preapproval.py (renamed from sleekxmpp/features/feature_preapproval/preapproval.py)12
-rw-r--r--slixmpp/features/feature_preapproval/stanza.py (renamed from sleekxmpp/features/feature_preapproval/stanza.py)6
-rw-r--r--slixmpp/features/feature_rosterver/__init__.py19
-rw-r--r--slixmpp/features/feature_rosterver/rosterver.py (renamed from sleekxmpp/features/feature_rosterver/rosterver.py)12
-rw-r--r--slixmpp/features/feature_rosterver/stanza.py (renamed from sleekxmpp/features/feature_rosterver/stanza.py)6
-rw-r--r--slixmpp/features/feature_session/__init__.py19
-rw-r--r--slixmpp/features/feature_session/session.py (renamed from sleekxmpp/features/feature_session/session.py)12
-rw-r--r--slixmpp/features/feature_session/stanza.py (renamed from sleekxmpp/features/feature_session/stanza.py)6
-rw-r--r--slixmpp/features/feature_starttls/__init__.py19
-rw-r--r--slixmpp/features/feature_starttls/stanza.py (renamed from sleekxmpp/features/feature_starttls/stanza.py)6
-rw-r--r--slixmpp/features/feature_starttls/starttls.py (renamed from sleekxmpp/features/feature_starttls/starttls.py)16
-rw-r--r--slixmpp/jid.py (renamed from sleekxmpp/jid.py)8
-rw-r--r--slixmpp/plugins/__init__.py (renamed from sleekxmpp/plugins/__init__.py)8
-rw-r--r--slixmpp/plugins/base.py (renamed from sleekxmpp/plugins/base.py)8
-rw-r--r--slixmpp/plugins/gmail_notify.py (renamed from sleekxmpp/plugins/gmail_notify.py)4
-rw-r--r--slixmpp/plugins/google/__init__.py (renamed from sleekxmpp/plugins/google/__init__.py)14
-rw-r--r--slixmpp/plugins/google/auth/__init__.py10
-rw-r--r--slixmpp/plugins/google/auth/auth.py (renamed from sleekxmpp/plugins/google/auth/auth.py)10
-rw-r--r--slixmpp/plugins/google/auth/stanza.py (renamed from sleekxmpp/plugins/google/auth/stanza.py)6
-rw-r--r--slixmpp/plugins/google/gmail/__init__.py10
-rw-r--r--slixmpp/plugins/google/gmail/notifications.py (renamed from sleekxmpp/plugins/google/gmail/notifications.py)16
-rw-r--r--slixmpp/plugins/google/gmail/stanza.py (renamed from sleekxmpp/plugins/google/gmail/stanza.py)6
-rw-r--r--slixmpp/plugins/google/nosave/__init__.py10
-rw-r--r--slixmpp/plugins/google/nosave/nosave.py (renamed from sleekxmpp/plugins/google/nosave/nosave.py)16
-rw-r--r--slixmpp/plugins/google/nosave/stanza.py (renamed from sleekxmpp/plugins/google/nosave/stanza.py)8
-rw-r--r--slixmpp/plugins/google/settings/__init__.py10
-rw-r--r--slixmpp/plugins/google/settings/settings.py (renamed from sleekxmpp/plugins/google/settings/settings.py)16
-rw-r--r--slixmpp/plugins/google/settings/stanza.py (renamed from sleekxmpp/plugins/google/settings/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0004/__init__.py22
-rw-r--r--slixmpp/plugins/xep_0004/dataforms.py (renamed from sleekxmpp/plugins/xep_0004/dataforms.py)18
-rw-r--r--slixmpp/plugins/xep_0004/stanza/__init__.py10
-rw-r--r--slixmpp/plugins/xep_0004/stanza/field.py (renamed from sleekxmpp/plugins/xep_0004/stanza/field.py)6
-rw-r--r--slixmpp/plugins/xep_0004/stanza/form.py (renamed from sleekxmpp/plugins/xep_0004/stanza/form.py)10
-rw-r--r--slixmpp/plugins/xep_0009/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0009/binding.py (renamed from sleekxmpp/plugins/xep_0009/binding.py)6
-rw-r--r--slixmpp/plugins/xep_0009/remote.py (renamed from sleekxmpp/plugins/xep_0009/remote.py)10
-rw-r--r--slixmpp/plugins/xep_0009/rpc.py (renamed from sleekxmpp/plugins/xep_0009/rpc.py)18
-rw-r--r--slixmpp/plugins/xep_0009/stanza/RPC.py (renamed from sleekxmpp/plugins/xep_0009/stanza/RPC.py)6
-rw-r--r--slixmpp/plugins/xep_0009/stanza/__init__.py9
-rw-r--r--slixmpp/plugins/xep_0012/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0012/last_activity.py (renamed from sleekxmpp/plugins/xep_0012/last_activity.py)18
-rw-r--r--slixmpp/plugins/xep_0012/stanza.py (renamed from sleekxmpp/plugins/xep_0012/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0013/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0013/offline.py (renamed from sleekxmpp/plugins/xep_0013/offline.py)20
-rw-r--r--slixmpp/plugins/xep_0013/stanza.py (renamed from sleekxmpp/plugins/xep_0013/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0016/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0016/privacy.py (renamed from sleekxmpp/plugins/xep_0016/privacy.py)14
-rw-r--r--slixmpp/plugins/xep_0016/stanza.py (renamed from sleekxmpp/plugins/xep_0016/stanza.py)2
-rw-r--r--slixmpp/plugins/xep_0020/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0020/feature_negotiation.py (renamed from sleekxmpp/plugins/xep_0020/feature_negotiation.py)18
-rw-r--r--slixmpp/plugins/xep_0020/stanza.py (renamed from sleekxmpp/plugins/xep_0020/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0027/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0027/gpg.py (renamed from sleekxmpp/plugins/xep_0027/gpg.py)18
-rw-r--r--slixmpp/plugins/xep_0027/stanza.py (renamed from sleekxmpp/plugins/xep_0027/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0030/__init__.py23
-rw-r--r--slixmpp/plugins/xep_0030/disco.py (renamed from sleekxmpp/plugins/xep_0030/disco.py)34
-rw-r--r--slixmpp/plugins/xep_0030/stanza/__init__.py10
-rw-r--r--slixmpp/plugins/xep_0030/stanza/info.py (renamed from sleekxmpp/plugins/xep_0030/stanza/info.py)8
-rw-r--r--slixmpp/plugins/xep_0030/stanza/items.py (renamed from sleekxmpp/plugins/xep_0030/stanza/items.py)10
-rw-r--r--slixmpp/plugins/xep_0030/static.py (renamed from sleekxmpp/plugins/xep_0030/static.py)20
-rw-r--r--slixmpp/plugins/xep_0033/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0033/addresses.py (renamed from sleekxmpp/plugins/xep_0033/addresses.py)12
-rw-r--r--slixmpp/plugins/xep_0033/stanza.py (renamed from sleekxmpp/plugins/xep_0033/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0045.py (renamed from sleekxmpp/plugins/xep_0045.py)18
-rw-r--r--slixmpp/plugins/xep_0047/__init__.py21
-rw-r--r--slixmpp/plugins/xep_0047/ibb.py (renamed from sleekxmpp/plugins/xep_0047/ibb.py)14
-rw-r--r--slixmpp/plugins/xep_0047/stanza.py (renamed from sleekxmpp/plugins/xep_0047/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0047/stream.py (renamed from sleekxmpp/plugins/xep_0047/stream.py)6
-rw-r--r--slixmpp/plugins/xep_0048/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0048/bookmarks.py (renamed from sleekxmpp/plugins/xep_0048/bookmarks.py)18
-rw-r--r--slixmpp/plugins/xep_0048/stanza.py (renamed from sleekxmpp/plugins/xep_0048/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0049/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0049/private_storage.py (renamed from sleekxmpp/plugins/xep_0049/private_storage.py)16
-rw-r--r--slixmpp/plugins/xep_0049/stanza.py (renamed from sleekxmpp/plugins/xep_0049/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0050/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0050/adhoc.py (renamed from sleekxmpp/plugins/xep_0050/adhoc.py)26
-rw-r--r--slixmpp/plugins/xep_0050/stanza.py (renamed from sleekxmpp/plugins/xep_0050/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0054/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0054/stanza.py (renamed from sleekxmpp/plugins/xep_0054/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0054/vcard_temp.py (renamed from sleekxmpp/plugins/xep_0054/vcard_temp.py)18
-rw-r--r--slixmpp/plugins/xep_0059/__init__.py18
-rw-r--r--slixmpp/plugins/xep_0059/rsm.py (renamed from sleekxmpp/plugins/xep_0059/rsm.py)16
-rw-r--r--slixmpp/plugins/xep_0059/stanza.py (renamed from sleekxmpp/plugins/xep_0059/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0060/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0060/pubsub.py (renamed from sleekxmpp/plugins/xep_0060/pubsub.py)30
-rw-r--r--slixmpp/plugins/xep_0060/stanza/__init__.py12
-rw-r--r--slixmpp/plugins/xep_0060/stanza/base.py (renamed from sleekxmpp/plugins/xep_0060/stanza/base.py)6
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub.py (renamed from sleekxmpp/plugins/xep_0060/stanza/pubsub.py)12
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub_errors.py (renamed from sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py)8
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub_event.py (renamed from sleekxmpp/plugins/xep_0060/stanza/pubsub_event.py)12
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub_owner.py (renamed from sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py)16
-rw-r--r--slixmpp/plugins/xep_0065/__init__.py7
-rw-r--r--slixmpp/plugins/xep_0065/proxy.py (renamed from sleekxmpp/plugins/xep_0065/proxy.py)16
-rw-r--r--slixmpp/plugins/xep_0065/stanza.py (renamed from sleekxmpp/plugins/xep_0065/stanza.py)4
-rw-r--r--slixmpp/plugins/xep_0066/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0066/oob.py (renamed from sleekxmpp/plugins/xep_0066/oob.py)18
-rw-r--r--slixmpp/plugins/xep_0066/stanza.py (renamed from sleekxmpp/plugins/xep_0066/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0071/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0071/stanza.py (renamed from sleekxmpp/plugins/xep_0071/stanza.py)12
-rw-r--r--slixmpp/plugins/xep_0071/xhtml_im.py (renamed from sleekxmpp/plugins/xep_0071/xhtml_im.py)12
-rw-r--r--slixmpp/plugins/xep_0077/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0077/register.py (renamed from sleekxmpp/plugins/xep_0077/register.py)12
-rw-r--r--slixmpp/plugins/xep_0077/stanza.py (renamed from sleekxmpp/plugins/xep_0077/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0078/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0078/legacyauth.py (renamed from sleekxmpp/plugins/xep_0078/legacyauth.py)16
-rw-r--r--slixmpp/plugins/xep_0078/stanza.py (renamed from sleekxmpp/plugins/xep_0078/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0079/__init__.py (renamed from sleekxmpp/plugins/xep_0079/__init__.py)10
-rw-r--r--slixmpp/plugins/xep_0079/amp.py (renamed from sleekxmpp/plugins/xep_0079/amp.py)16
-rw-r--r--slixmpp/plugins/xep_0079/stanza.py (renamed from sleekxmpp/plugins/xep_0079/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0080/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0080/geoloc.py (renamed from sleekxmpp/plugins/xep_0080/geoloc.py)16
-rw-r--r--slixmpp/plugins/xep_0080/stanza.py (renamed from sleekxmpp/plugins/xep_0080/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0082.py (renamed from sleekxmpp/plugins/xep_0082.py)8
-rw-r--r--slixmpp/plugins/xep_0084/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0084/avatar.py (renamed from sleekxmpp/plugins/xep_0084/avatar.py)18
-rw-r--r--slixmpp/plugins/xep_0084/stanza.py (renamed from sleekxmpp/plugins/xep_0084/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0085/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0085/chat_states.py (renamed from sleekxmpp/plugins/xep_0085/chat_states.py)18
-rw-r--r--slixmpp/plugins/xep_0085/stanza.py (renamed from sleekxmpp/plugins/xep_0085/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0086/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0086/legacy_error.py (renamed from sleekxmpp/plugins/xep_0086/legacy_error.py)12
-rw-r--r--slixmpp/plugins/xep_0086/stanza.py (renamed from sleekxmpp/plugins/xep_0086/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0091/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0091/legacy_delay.py (renamed from sleekxmpp/plugins/xep_0091/legacy_delay.py)12
-rw-r--r--slixmpp/plugins/xep_0091/stanza.py (renamed from sleekxmpp/plugins/xep_0091/stanza.py)10
-rw-r--r--slixmpp/plugins/xep_0092/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0092/stanza.py (renamed from sleekxmpp/plugins/xep_0092/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0092/version.py (renamed from sleekxmpp/plugins/xep_0092/version.py)22
-rw-r--r--slixmpp/plugins/xep_0095/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0095/stanza.py (renamed from sleekxmpp/plugins/xep_0095/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0095/stream_initiation.py (renamed from sleekxmpp/plugins/xep_0095/stream_initiation.py)18
-rw-r--r--slixmpp/plugins/xep_0096/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0096/file_transfer.py (renamed from sleekxmpp/plugins/xep_0096/file_transfer.py)16
-rw-r--r--slixmpp/plugins/xep_0096/stanza.py (renamed from sleekxmpp/plugins/xep_0096/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0106.py (renamed from sleekxmpp/plugins/xep_0106.py)6
-rw-r--r--slixmpp/plugins/xep_0107/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0107/stanza.py (renamed from sleekxmpp/plugins/xep_0107/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0107/user_mood.py (renamed from sleekxmpp/plugins/xep_0107/user_mood.py)20
-rw-r--r--slixmpp/plugins/xep_0108/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0108/stanza.py (renamed from sleekxmpp/plugins/xep_0108/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0108/user_activity.py (renamed from sleekxmpp/plugins/xep_0108/user_activity.py)12
-rw-r--r--slixmpp/plugins/xep_0115/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0115/caps.py (renamed from sleekxmpp/plugins/xep_0115/caps.py)22
-rw-r--r--slixmpp/plugins/xep_0115/stanza.py (renamed from sleekxmpp/plugins/xep_0115/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0115/static.py (renamed from sleekxmpp/plugins/xep_0115/static.py)12
-rw-r--r--slixmpp/plugins/xep_0118/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0118/stanza.py (renamed from sleekxmpp/plugins/xep_0118/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0118/user_tune.py (renamed from sleekxmpp/plugins/xep_0118/user_tune.py)12
-rw-r--r--slixmpp/plugins/xep_0128/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0128/extended_disco.py (renamed from sleekxmpp/plugins/xep_0128/extended_disco.py)20
-rw-r--r--slixmpp/plugins/xep_0128/static.py (renamed from sleekxmpp/plugins/xep_0128/static.py)8
-rw-r--r--slixmpp/plugins/xep_0131/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0131/headers.py (renamed from sleekxmpp/plugins/xep_0131/headers.py)14
-rw-r--r--slixmpp/plugins/xep_0131/stanza.py (renamed from sleekxmpp/plugins/xep_0131/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0133.py (renamed from sleekxmpp/plugins/xep_0133.py)6
-rw-r--r--slixmpp/plugins/xep_0152/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0152/reachability.py (renamed from sleekxmpp/plugins/xep_0152/reachability.py)12
-rw-r--r--slixmpp/plugins/xep_0152/stanza.py (renamed from sleekxmpp/plugins/xep_0152/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0153/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0153/stanza.py (renamed from sleekxmpp/plugins/xep_0153/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0153/vcard_avatar.py (renamed from sleekxmpp/plugins/xep_0153/vcard_avatar.py)14
-rw-r--r--slixmpp/plugins/xep_0163.py (renamed from sleekxmpp/plugins/xep_0163.py)10
-rw-r--r--slixmpp/plugins/xep_0172/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0172/stanza.py (renamed from sleekxmpp/plugins/xep_0172/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0172/user_nick.py (renamed from sleekxmpp/plugins/xep_0172/user_nick.py)22
-rw-r--r--slixmpp/plugins/xep_0184/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0184/receipt.py (renamed from sleekxmpp/plugins/xep_0184/receipt.py)16
-rw-r--r--slixmpp/plugins/xep_0184/stanza.py (renamed from sleekxmpp/plugins/xep_0184/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0186/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0186/invisible_command.py (renamed from sleekxmpp/plugins/xep_0186/invisible_command.py)12
-rw-r--r--slixmpp/plugins/xep_0186/stanza.py (renamed from sleekxmpp/plugins/xep_0186/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0191/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0191/blocking.py (renamed from sleekxmpp/plugins/xep_0191/blocking.py)16
-rw-r--r--slixmpp/plugins/xep_0191/stanza.py (renamed from sleekxmpp/plugins/xep_0191/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0196/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0196/stanza.py (renamed from sleekxmpp/plugins/xep_0196/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0196/user_gaming.py (renamed from sleekxmpp/plugins/xep_0196/user_gaming.py)12
-rw-r--r--slixmpp/plugins/xep_0198/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0198/stanza.py (renamed from sleekxmpp/plugins/xep_0198/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0198/stream_management.py (renamed from sleekxmpp/plugins/xep_0198/stream_management.py)16
-rw-r--r--slixmpp/plugins/xep_0199/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0199/ping.py (renamed from sleekxmpp/plugins/xep_0199/ping.py)20
-rw-r--r--slixmpp/plugins/xep_0199/stanza.py (renamed from sleekxmpp/plugins/xep_0199/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0202/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0202/stanza.py (renamed from sleekxmpp/plugins/xep_0202/stanza.py)10
-rw-r--r--slixmpp/plugins/xep_0202/time.py (renamed from sleekxmpp/plugins/xep_0202/time.py)18
-rw-r--r--slixmpp/plugins/xep_0203/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0203/delay.py (renamed from sleekxmpp/plugins/xep_0203/delay.py)12
-rw-r--r--slixmpp/plugins/xep_0203/stanza.py (renamed from sleekxmpp/plugins/xep_0203/stanza.py)10
-rw-r--r--slixmpp/plugins/xep_0221/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0221/media.py (renamed from sleekxmpp/plugins/xep_0221/media.py)12
-rw-r--r--slixmpp/plugins/xep_0221/stanza.py (renamed from sleekxmpp/plugins/xep_0221/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0222.py (renamed from sleekxmpp/plugins/xep_0222.py)12
-rw-r--r--slixmpp/plugins/xep_0223.py (renamed from sleekxmpp/plugins/xep_0223.py)12
-rw-r--r--slixmpp/plugins/xep_0224/__init__.py20
-rw-r--r--slixmpp/plugins/xep_0224/attention.py (renamed from sleekxmpp/plugins/xep_0224/attention.py)16
-rw-r--r--slixmpp/plugins/xep_0224/stanza.py (renamed from sleekxmpp/plugins/xep_0224/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0231/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0231/bob.py (renamed from sleekxmpp/plugins/xep_0231/bob.py)18
-rw-r--r--slixmpp/plugins/xep_0231/stanza.py (renamed from sleekxmpp/plugins/xep_0231/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0235/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0235/oauth.py (renamed from sleekxmpp/plugins/xep_0235/oauth.py)12
-rw-r--r--slixmpp/plugins/xep_0235/stanza.py (renamed from sleekxmpp/plugins/xep_0235/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0242.py (renamed from sleekxmpp/plugins/xep_0242.py)6
-rw-r--r--slixmpp/plugins/xep_0249/__init__.py19
-rw-r--r--slixmpp/plugins/xep_0249/invite.py (renamed from sleekxmpp/plugins/xep_0249/invite.py)18
-rw-r--r--slixmpp/plugins/xep_0249/stanza.py (renamed from sleekxmpp/plugins/xep_0249/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0256.py (renamed from sleekxmpp/plugins/xep_0256.py)14
-rw-r--r--slixmpp/plugins/xep_0257/__init__.py17
-rw-r--r--slixmpp/plugins/xep_0257/client_cert_management.py (renamed from sleekxmpp/plugins/xep_0257/client_cert_management.py)14
-rw-r--r--slixmpp/plugins/xep_0257/stanza.py (renamed from sleekxmpp/plugins/xep_0257/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0258/__init__.py18
-rw-r--r--slixmpp/plugins/xep_0258/security_labels.py (renamed from sleekxmpp/plugins/xep_0258/security_labels.py)12
-rw-r--r--slixmpp/plugins/xep_0258/stanza.py (renamed from sleekxmpp/plugins/xep_0258/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0270.py (renamed from sleekxmpp/plugins/xep_0270.py)6
-rw-r--r--slixmpp/plugins/xep_0279/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0279/ipcheck.py (renamed from sleekxmpp/plugins/xep_0279/ipcheck.py)12
-rw-r--r--slixmpp/plugins/xep_0279/stanza.py (renamed from sleekxmpp/plugins/xep_0279/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0280/__init__.py17
-rw-r--r--slixmpp/plugins/xep_0280/carbons.py (renamed from sleekxmpp/plugins/xep_0280/carbons.py)18
-rw-r--r--slixmpp/plugins/xep_0280/stanza.py (renamed from sleekxmpp/plugins/xep_0280/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0297/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0297/forwarded.py (renamed from sleekxmpp/plugins/xep_0297/forwarded.py)16
-rw-r--r--slixmpp/plugins/xep_0297/stanza.py (renamed from sleekxmpp/plugins/xep_0297/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0302.py (renamed from sleekxmpp/plugins/xep_0302.py)6
-rw-r--r--slixmpp/plugins/xep_0308/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0308/correction.py (renamed from sleekxmpp/plugins/xep_0308/correction.py)18
-rw-r--r--slixmpp/plugins/xep_0308/stanza.py (renamed from sleekxmpp/plugins/xep_0308/stanza.py)6
-rw-r--r--slixmpp/plugins/xep_0313/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0313/mam.py (renamed from sleekxmpp/plugins/xep_0313/mam.py)20
-rw-r--r--slixmpp/plugins/xep_0313/stanza.py (renamed from sleekxmpp/plugins/xep_0313/stanza.py)10
-rw-r--r--slixmpp/plugins/xep_0319/__init__.py16
-rw-r--r--slixmpp/plugins/xep_0319/idle.py (renamed from sleekxmpp/plugins/xep_0319/idle.py)16
-rw-r--r--slixmpp/plugins/xep_0319/stanza.py (renamed from sleekxmpp/plugins/xep_0319/stanza.py)8
-rw-r--r--slixmpp/plugins/xep_0323/__init__.py (renamed from sleekxmpp/plugins/xep_0323/__init__.py)10
-rw-r--r--slixmpp/plugins/xep_0323/device.py (renamed from sleekxmpp/plugins/xep_0323/device.py)4
-rw-r--r--slixmpp/plugins/xep_0323/sensordata.py (renamed from sleekxmpp/plugins/xep_0323/sensordata.py)18
-rw-r--r--slixmpp/plugins/xep_0323/stanza/__init__.py (renamed from sleekxmpp/plugins/xep_0325/stanza/__init__.py)6
-rw-r--r--slixmpp/plugins/xep_0323/stanza/base.py (renamed from sleekxmpp/plugins/xep_0325/stanza/base.py)6
-rw-r--r--slixmpp/plugins/xep_0323/stanza/sensordata.py (renamed from sleekxmpp/plugins/xep_0323/stanza/sensordata.py)8
-rw-r--r--slixmpp/plugins/xep_0323/timerreset.py (renamed from sleekxmpp/plugins/xep_0323/timerreset.py)4
-rw-r--r--slixmpp/plugins/xep_0325/__init__.py (renamed from sleekxmpp/plugins/xep_0325/__init__.py)10
-rw-r--r--slixmpp/plugins/xep_0325/control.py (renamed from sleekxmpp/plugins/xep_0325/control.py)16
-rw-r--r--slixmpp/plugins/xep_0325/device.py (renamed from sleekxmpp/plugins/xep_0325/device.py)4
-rw-r--r--slixmpp/plugins/xep_0325/stanza/__init__.py (renamed from sleekxmpp/plugins/xep_0323/stanza/__init__.py)6
-rw-r--r--slixmpp/plugins/xep_0325/stanza/base.py (renamed from sleekxmpp/plugins/xep_0323/stanza/base.py)6
-rw-r--r--slixmpp/plugins/xep_0325/stanza/control.py (renamed from sleekxmpp/plugins/xep_0325/stanza/control.py)8
-rw-r--r--slixmpp/roster/__init__.py11
-rw-r--r--slixmpp/roster/item.py (renamed from sleekxmpp/roster/item.py)8
-rw-r--r--slixmpp/roster/multi.py (renamed from sleekxmpp/roster/multi.py)16
-rw-r--r--slixmpp/roster/single.py (renamed from sleekxmpp/roster/single.py)12
-rw-r--r--slixmpp/stanza/__init__.py15
-rw-r--r--slixmpp/stanza/atom.py (renamed from sleekxmpp/stanza/atom.py)6
-rw-r--r--slixmpp/stanza/error.py (renamed from sleekxmpp/stanza/error.py)6
-rw-r--r--slixmpp/stanza/htmlim.py (renamed from sleekxmpp/stanza/htmlim.py)10
-rw-r--r--slixmpp/stanza/iq.py (renamed from sleekxmpp/stanza/iq.py)16
-rw-r--r--slixmpp/stanza/message.py (renamed from sleekxmpp/stanza/message.py)8
-rw-r--r--slixmpp/stanza/nick.py (renamed from sleekxmpp/stanza/nick.py)10
-rw-r--r--slixmpp/stanza/presence.py (renamed from sleekxmpp/stanza/presence.py)8
-rw-r--r--slixmpp/stanza/rootstanza.py (renamed from sleekxmpp/stanza/rootstanza.py)12
-rw-r--r--slixmpp/stanza/roster.py (renamed from sleekxmpp/stanza/roster.py)10
-rw-r--r--slixmpp/stanza/stream_error.py (renamed from sleekxmpp/stanza/stream_error.py)8
-rw-r--r--slixmpp/stanza/stream_features.py (renamed from sleekxmpp/stanza/stream_features.py)8
-rw-r--r--slixmpp/test/__init__.py11
-rw-r--r--slixmpp/test/livesocket.py (renamed from sleekxmpp/test/livesocket.py)6
-rw-r--r--slixmpp/test/mocksocket.py (renamed from sleekxmpp/test/mocksocket.py)6
-rw-r--r--slixmpp/test/slixtest.py (renamed from sleekxmpp/test/sleektest.py)26
-rw-r--r--slixmpp/thirdparty/__init__.py12
-rw-r--r--slixmpp/thirdparty/gnupg.py (renamed from sleekxmpp/thirdparty/gnupg.py)0
-rw-r--r--slixmpp/thirdparty/mini_dateutil.py (renamed from sleekxmpp/thirdparty/mini_dateutil.py)0
-rw-r--r--slixmpp/thirdparty/ordereddict.py (renamed from sleekxmpp/thirdparty/ordereddict.py)0
-rw-r--r--slixmpp/thirdparty/socks.py (renamed from sleekxmpp/thirdparty/socks.py)0
-rw-r--r--slixmpp/thirdparty/statemachine.py (renamed from sleekxmpp/thirdparty/statemachine.py)4
-rw-r--r--slixmpp/util/__init__.py (renamed from sleekxmpp/util/__init__.py)6
-rw-r--r--slixmpp/util/misc_ops.py (renamed from sleekxmpp/util/misc_ops.py)0
-rw-r--r--slixmpp/util/sasl/__init__.py (renamed from sleekxmpp/util/sasl/__init__.py)8
-rw-r--r--slixmpp/util/sasl/client.py (renamed from sleekxmpp/util/sasl/client.py)6
-rw-r--r--slixmpp/util/sasl/mechanisms.py (renamed from sleekxmpp/util/sasl/mechanisms.py)8
-rw-r--r--slixmpp/util/stringprep_profiles.py (renamed from sleekxmpp/util/stringprep_profiles.py)6
-rw-r--r--slixmpp/version.py (renamed from sleekxmpp/version.py)4
-rw-r--r--slixmpp/xmlstream/__init__.py19
-rw-r--r--slixmpp/xmlstream/cert.py (renamed from sleekxmpp/xmlstream/cert.py)0
-rw-r--r--slixmpp/xmlstream/filesocket.py (renamed from sleekxmpp/xmlstream/filesocket.py)4
-rw-r--r--slixmpp/xmlstream/handler/__init__.py15
-rw-r--r--slixmpp/xmlstream/handler/base.py (renamed from sleekxmpp/xmlstream/handler/base.py)14
-rw-r--r--slixmpp/xmlstream/handler/callback.py (renamed from sleekxmpp/xmlstream/handler/callback.py)18
-rw-r--r--slixmpp/xmlstream/handler/collector.py (renamed from sleekxmpp/xmlstream/handler/collector.py)14
-rw-r--r--slixmpp/xmlstream/handler/waiter.py (renamed from sleekxmpp/xmlstream/handler/waiter.py)16
-rw-r--r--slixmpp/xmlstream/handler/xmlcallback.py (renamed from sleekxmpp/xmlstream/handler/xmlcallback.py)6
-rw-r--r--slixmpp/xmlstream/handler/xmlwaiter.py (renamed from sleekxmpp/xmlstream/handler/xmlwaiter.py)6
-rw-r--r--slixmpp/xmlstream/jid.py5
-rw-r--r--slixmpp/xmlstream/matcher/__init__.py17
-rw-r--r--slixmpp/xmlstream/matcher/base.py (renamed from sleekxmpp/xmlstream/matcher/base.py)4
-rw-r--r--slixmpp/xmlstream/matcher/id.py (renamed from sleekxmpp/xmlstream/matcher/id.py)8
-rw-r--r--slixmpp/xmlstream/matcher/idsender.py (renamed from sleekxmpp/xmlstream/matcher/idsender.py)8
-rw-r--r--slixmpp/xmlstream/matcher/many.py (renamed from sleekxmpp/xmlstream/matcher/many.py)6
-rw-r--r--slixmpp/xmlstream/matcher/stanzapath.py (renamed from sleekxmpp/xmlstream/matcher/stanzapath.py)12
-rw-r--r--slixmpp/xmlstream/matcher/xmlmask.py (renamed from sleekxmpp/xmlstream/matcher/xmlmask.py)12
-rw-r--r--slixmpp/xmlstream/matcher/xpath.py (renamed from sleekxmpp/xmlstream/matcher/xpath.py)12
-rw-r--r--slixmpp/xmlstream/resolver.py (renamed from sleekxmpp/xmlstream/resolver.py)2
-rw-r--r--slixmpp/xmlstream/scheduler.py (renamed from sleekxmpp/xmlstream/scheduler.py)8
-rw-r--r--slixmpp/xmlstream/stanzabase.py (renamed from sleekxmpp/xmlstream/stanzabase.py)24
-rw-r--r--slixmpp/xmlstream/tostring.py (renamed from sleekxmpp/xmlstream/tostring.py)6
-rw-r--r--slixmpp/xmlstream/xmlstream.py (renamed from sleekxmpp/xmlstream/xmlstream.py)38
-rw-r--r--tests/live_multiple_streams.py8
-rw-r--r--tests/live_test.py4
-rw-r--r--tests/test_events.py4
-rw-r--r--tests/test_jid.py8
-rw-r--r--tests/test_overall.py4
-rw-r--r--tests/test_plugins.py2
-rw-r--r--tests/test_stanza_base.py6
-rw-r--r--tests/test_stanza_element.py8
-rw-r--r--tests/test_stanza_error.py4
-rw-r--r--tests/test_stanza_gmail.py10
-rw-r--r--tests/test_stanza_iq.py6
-rw-r--r--tests/test_stanza_message.py14
-rw-r--r--tests/test_stanza_presence.py8
-rw-r--r--tests/test_stanza_roster.py6
-rw-r--r--tests/test_stanza_xep_0004.py12
-rw-r--r--tests/test_stanza_xep_0009.py18
-rw-r--r--tests/test_stanza_xep_0030.py10
-rw-r--r--tests/test_stanza_xep_0033.py10
-rw-r--r--tests/test_stanza_xep_0047.py14
-rw-r--r--tests/test_stanza_xep_0050.py10
-rw-r--r--tests/test_stanza_xep_0059.py8
-rw-r--r--tests/test_stanza_xep_0060.py22
-rw-r--r--tests/test_stanza_xep_0085.py10
-rw-r--r--tests/test_stanza_xep_0184.py10
-rw-r--r--tests/test_stanza_xep_0323.py6
-rw-r--r--tests/test_stanza_xep_0325.py10
-rw-r--r--tests/test_stream.py4
-rw-r--r--tests/test_stream_exceptions.py20
-rw-r--r--tests/test_stream_filters.py6
-rw-r--r--tests/test_stream_handlers.py18
-rw-r--r--tests/test_stream_presence.py4
-rw-r--r--tests/test_stream_roster.py6
-rw-r--r--tests/test_stream_xep_0030.py4
-rw-r--r--tests/test_stream_xep_0047.py4
-rw-r--r--tests/test_stream_xep_0050.py6
-rw-r--r--tests/test_stream_xep_0059.py10
-rw-r--r--tests/test_stream_xep_0060.py8
-rw-r--r--tests/test_stream_xep_0066.py12
-rw-r--r--tests/test_stream_xep_0085.py4
-rw-r--r--tests/test_stream_xep_0092.py8
-rw-r--r--tests/test_stream_xep_0128.py4
-rw-r--r--tests/test_stream_xep_0249.py8
-rw-r--r--tests/test_stream_xep_0323.py8
-rw-r--r--tests/test_stream_xep_0325.py12
-rw-r--r--tests/test_tostring.py10
-rw-r--r--tox.ini2
514 files changed, 3473 insertions, 3530 deletions
diff --git a/.gitignore b/.gitignore
index 602416e..21757a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ docs/_build/
*.swp
.tox/
.coverage
-sleekxmpp.egg-info/
+slixmpp.egg-info/
.ropeproject/
4913
*~
diff --git a/README.rst b/README.rst
index 7c14ab5..e2c8225 100644
--- 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.3.1 <http://github.com/fritzy/SleekXMPP/zipball/1.3.1>`_
-
-**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):
@@ -155,8 +91,15 @@ 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 <http://twitter.com/fritzy>`_
diff --git a/docs/Makefile b/docs/Makefile
index a520f6a..d44cd8a 100644
--- 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:
diff --git a/docs/api/basexmpp.rst b/docs/api/basexmpp.rst
index fa96322..df05bb0 100644
--- a/docs/api/basexmpp.rst
+++ b/docs/api/basexmpp.rst
@@ -2,7 +2,7 @@
BaseXMPP
========
-.. module:: sleekxmpp.basexmpp
+.. module:: slixmpp.basexmpp
.. autoclass:: BaseXMPP
:members:
diff --git a/docs/api/clientxmpp.rst b/docs/api/clientxmpp.rst
index a6f32c4..232c37c 100644
--- a/docs/api/clientxmpp.rst
+++ b/docs/api/clientxmpp.rst
@@ -2,7 +2,7 @@
ClientXMPP
==========
-.. module:: sleekxmpp.clientxmpp
+.. module:: slixmpp.clientxmpp
.. autoclass:: ClientXMPP
:members:
diff --git a/docs/api/componentxmpp.rst b/docs/api/componentxmpp.rst
index 989120c..9c6366a 100644
--- a/docs/api/componentxmpp.rst
+++ b/docs/api/componentxmpp.rst
@@ -2,7 +2,7 @@
ComponentXMPP
=============
-.. module:: sleekxmpp.componentxmpp
+.. module:: slixmpp.componentxmpp
.. autoclass:: ComponentXMPP
:members:
diff --git a/docs/api/exceptions.rst b/docs/api/exceptions.rst
index 7bc72ce..0736a09 100644
--- a/docs/api/exceptions.rst
+++ b/docs/api/exceptions.rst
@@ -1,7 +1,7 @@
Exceptions
==========
-.. module:: sleekxmpp.exceptions
+.. module:: slixmpp.exceptions
.. autoexception:: XMPPError
diff --git a/docs/api/xmlstream/filesocket.rst b/docs/api/xmlstream/filesocket.rst
index 35f4401..eff062d 100644
--- 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:
diff --git a/docs/api/xmlstream/handler.rst b/docs/api/xmlstream/handler.rst
index 33c0bf4..ab8091a 100644
--- 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:
diff --git a/docs/api/xmlstream/jid.rst b/docs/api/xmlstream/jid.rst
index 22a2db4..1844b75 100644
--- 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:
diff --git a/docs/api/xmlstream/matcher.rst b/docs/api/xmlstream/matcher.rst
index df3591b..793059f 100644
--- 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:
diff --git a/docs/api/xmlstream/scheduler.rst b/docs/api/xmlstream/scheduler.rst
index ff91701..59752ec 100644
--- 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:
diff --git a/docs/api/xmlstream/stanzabase.rst b/docs/api/xmlstream/stanzabase.rst
index f575299..ec28baf 100644
--- 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
diff --git a/docs/api/xmlstream/tostring.rst b/docs/api/xmlstream/tostring.rst
index 82a8c2a..8d75f1d 100644
--- 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
diff --git a/docs/api/xmlstream/xmlstream.rst b/docs/api/xmlstream/xmlstream.rst
index 90a7a6a..ced2ed1 100644
--- a/docs/api/xmlstream/xmlstream.rst
+++ b/docs/api/xmlstream/xmlstream.rst
@@ -2,7 +2,7 @@
XML Stream
==========
-.. module:: sleekxmpp.xmlstream.xmlstream
+.. module:: slixmpp.xmlstream.xmlstream
.. autoexception:: RestartStream
diff --git a/docs/architecture.rst b/docs/architecture.rst
index a2e0a27..52bb8d9 100644
--- 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.
@@ -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.
@@ -148,8 +148,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 +157,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 +172,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.
diff --git a/docs/conf.py b/docs/conf.py
index 72e39d0..fbb61b3 100644
--- 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)
]
diff --git a/docs/create_plugin.rst b/docs/create_plugin.rst
index 2b0514b..7e082a7 100644
--- 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:`base_plugin <slixmpp.plugins.base.base_plugin>`,
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
@@ -42,7 +42,7 @@ module. To do so, use the following form when registering the 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,13 +50,13 @@ 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 base_plugin
class xep_0077(base_plugin):
"""
@@ -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
@@ -83,12 +83,12 @@ finish activating the plugin.
The ``post_init`` method needs to call ``base_plugin.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
@@ -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.
@@ -484,12 +484,12 @@ 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')
@@ -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 base_plugin
+ 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
diff --git a/docs/event_index.rst b/docs/event_index.rst
index ee8f5a9..b5f249f 100644
--- 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,24 +116,24 @@ 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.
@@ -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`
diff --git a/docs/getting_started/component.rst b/docs/getting_started/component.rst
index ce548ba..efac7ad 100644
--- a/docs/getting_started/component.rst
+++ b/docs/getting_started/component.rst
@@ -8,17 +8,17 @@ Create and Run a Server Component
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
@@ -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
diff --git a/docs/getting_started/echobot.rst b/docs/getting_started/echobot.rst
index 7d29ec5..df5aa2b 100644
--- 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,14 +85,14 @@ 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)
@@ -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.
@@ -201,7 +201,7 @@ Let's take a closer look at the ``.reply()`` method used above. For message stan
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,13 +229,13 @@ 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.
@@ -305,7 +305,7 @@ the ``EchoBot.__init__`` method instead.
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
@@ -313,11 +313,11 @@ the ``EchoBot.__init__`` method instead.
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.base_plugin.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::
- 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::
diff --git a/docs/getting_started/iq.rst b/docs/getting_started/iq.rst
index 98e0bda..cbf3d47 100644
--- 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
+: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
@@ -90,11 +90,11 @@ These options are:
# ... 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,9 +124,9 @@ 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::
@@ -135,13 +135,13 @@ interfacting with the :class:`~sleekxmpp.stanza.iq.Iq` payload.
* :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
diff --git a/docs/getting_started/muc.rst b/docs/getting_started/muc.rst
index 26e1fa5..8e41790 100644
--- 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
diff --git a/docs/getting_started/proxy.rst b/docs/getting_started/proxy.rst
index 60d521c..b5e7418 100644
--- a/docs/getting_started/proxy.rst
+++ b/docs/getting_started/proxy.rst
@@ -8,16 +8,16 @@ Enable HTTP Proxy Support
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
diff --git a/docs/getting_started/sendlogout.rst b/docs/getting_started/sendlogout.rst
index a1352db..5b23a46 100644
--- a/docs/getting_started/sendlogout.rst
+++ b/docs/getting_started/sendlogout.rst
@@ -5,25 +5,25 @@ Sign in, Send a Message, and Disconnect
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
+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>`.
+: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
diff --git a/docs/guide_xep_0030.rst b/docs/guide_xep_0030.rst
index cb8d7d2..cd0f485 100644
--- 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')
diff --git a/docs/index.rst b/docs/index.rst
index 6f6d891..33d6cd0 100644
--- 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>`_
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):
@@ -161,7 +161,7 @@ Plugin Guides
guide_xep_0030
-SleekXMPP Architecture and Design
+Slixmpp Architecture and Design
---------------------------------
.. toctree::
:maxdepth: 3
diff --git a/docs/make.bat b/docs/make.bat
index d97407a..33fda62 100644
--- 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
)
diff --git a/docs/xmpp_tdg.rst b/docs/xmpp_tdg.rst
index 3d12b1b..c0d8519 100644
--- 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.
@@ -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,8 +72,8 @@ 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)
@@ -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.
@@ -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>`_ |
@@ -209,7 +209,7 @@ Example 14-7. (Page 225)
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
diff --git a/examples/IoT_TestDevice.py b/examples/IoT_TestDevice.py
index 8105aaf..1d99c61 100755
--- a/examples/IoT_TestDevice.py
+++ b/examples/IoT_TestDevice.py
@@ -2,11 +2,11 @@
# -*- 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
@@ -26,28 +26,28 @@ from os.path import splitext, basename, join as pjoin
from optparse import OptionParser
from urllib import urlopen
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-from sleekxmpp.plugins.xep_0323.device import Device
+from slixmpp.plugins.xep_0323.device import Device
-#from sleekxmpp.exceptions import IqError, IqTimeout
+#from slixmpp.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
diff --git a/examples/adhoc_provider.py b/examples/adhoc_provider.py
index 86a575c..c709fea 100755
--- a/examples/adhoc_provider.py
+++ b/examples/adhoc_provider.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,28 +14,28 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/adhoc_user.py b/examples/adhoc_user.py
index 7df9f79..d4b650b 100755
--- a/examples/adhoc_user.py
+++ b/examples/adhoc_user.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,28 +14,28 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/admin_commands.py b/examples/admin_commands.py
index 5d9bf84..ed81b88 100755
--- a/examples/admin_commands.py
+++ b/examples/admin_commands.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,28 +14,28 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/custom_stanzas/custom_stanza_provider.py b/examples/custom_stanzas/custom_stanza_provider.py
index 0ebdb77..163f307 100755
--- a/examples/custom_stanzas/custom_stanza_provider.py
+++ b/examples/custom_stanzas/custom_stanza_provider.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,35 +14,35 @@ import logging
import getpass
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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
diff --git a/examples/custom_stanzas/custom_stanza_user.py b/examples/custom_stanzas/custom_stanza_user.py
index 418e321..ceadb03 100755
--- a/examples/custom_stanzas/custom_stanza_user.py
+++ b/examples/custom_stanzas/custom_stanza_user.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,33 +14,33 @@ import logging
import getpass
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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
diff --git a/examples/custom_stanzas/stanza.py b/examples/custom_stanzas/stanza.py
index 50d0f9f..ba109b0 100644
--- a/examples/custom_stanzas/stanza.py
+++ b/examples/custom_stanzas/stanza.py
@@ -1,11 +1,11 @@
-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>
@@ -17,7 +17,7 @@ class Action(ElementBase):
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
@@ -50,7 +50,7 @@ class Action(ElementBase):
#: 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
diff --git a/examples/disco_browser.py b/examples/disco_browser.py
index aeb4fb5..9df22bb 100755
--- a/examples/disco_browser.py
+++ b/examples/disco_browser.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,22 +14,22 @@ import logging
import getpass
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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 +42,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')
diff --git a/examples/download_avatars.py b/examples/download_avatars.py
index 64300cf..bd50543 100755
--- a/examples/download_avatars.py
+++ b/examples/download_avatars.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -15,16 +15,16 @@ import getpass
import threading
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
@@ -37,14 +37,14 @@ 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)
+ slixmpp.ClientXMPP.__init__(self, jid, password)
self.add_event_handler("session_start", self.start, threaded=True)
self.add_event_handler("changed_status", self.wait_for_presences)
diff --git a/examples/echo_client.py b/examples/echo_client.py
index f2d3884..2c99215 100755
--- a/examples/echo_client.py
+++ b/examples/echo_client.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,28 +14,28 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/echo_component.py b/examples/echo_component.py
index 9a24f2f..a20f8c1 100755
--- a/examples/echo_component.py
+++ b/examples/echo_component.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,15 +14,15 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
-from sleekxmpp.componentxmpp import ComponentXMPP
+import slixmpp
+from slixmpp.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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
@@ -31,7 +31,7 @@ else:
class EchoComponent(ComponentXMPP):
"""
- A simple SleekXMPP component that echoes messages.
+ A simple Slixmpp component that echoes messages.
"""
def __init__(self, jid, secret, server, port):
diff --git a/examples/gtalk_custom_domain.py b/examples/gtalk_custom_domain.py
index c974fc5..b12a047 100755
--- a/examples/gtalk_custom_domain.py
+++ b/examples/gtalk_custom_domain.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,33 +14,33 @@ import logging
import getpass
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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
diff --git a/examples/ibb_transfer/ibb_receiver.py b/examples/ibb_transfer/ibb_receiver.py
index 6aba98e..625dd45 100755
--- a/examples/ibb_transfer/ibb_receiver.py
+++ b/examples/ibb_transfer/ibb_receiver.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,27 +14,27 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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', {
diff --git a/examples/ibb_transfer/ibb_sender.py b/examples/ibb_transfer/ibb_sender.py
index 7c380b6..e89e323 100755
--- a/examples/ibb_transfer/ibb_sender.py
+++ b/examples/ibb_transfer/ibb_sender.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,27 +14,27 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/migrate_roster.py b/examples/migrate_roster.py
index 797e4f4..7aed1d3 100755
--- a/examples/migrate_roster.py
+++ b/examples/migrate_roster.py
@@ -6,14 +6,14 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
@@ -62,7 +62,7 @@ if opts.new_password is None:
opts.new_password = getpass.getpass("New Password: ")
-old_xmpp = sleekxmpp.ClientXMPP(opts.old_jid, opts.old_password)
+old_xmpp = slixmpp.ClientXMPP(opts.old_jid, opts.old_password)
# If you are connecting to Facebook and wish to use the
# X-FACEBOOK-PLATFORM authentication mechanism, you will need
@@ -98,7 +98,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(opts.new_jid, opts.new_password)
def on_session2(event):
new_xmpp.get_roster()
new_xmpp.send_presence()
diff --git a/examples/muc.py b/examples/muc.py
index 5b5c764..083c4c2 100755
--- a/examples/muc.py
+++ b/examples/muc.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,29 +14,29 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/ping.py b/examples/ping.py
index 1a1c2e9..b079c41 100755
--- a/examples/ping.py
+++ b/examples/ping.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,28 +14,28 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/proxy_echo_client.py b/examples/proxy_echo_client.py
index 98935b9..966dd0a 100755
--- a/examples/proxy_echo_client.py
+++ b/examples/proxy_echo_client.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,28 +14,28 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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
diff --git a/examples/pubsub_client.py b/examples/pubsub_client.py
index 9a65553..56135ec 100755
--- a/examples/pubsub_client.py
+++ b/examples/pubsub_client.py
@@ -6,22 +6,22 @@ import logging
import getpass
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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=''):
diff --git a/examples/pubsub_events.py b/examples/pubsub_events.py
index 12c33a7..679112a 100755
--- a/examples/pubsub_events.py
+++ b/examples/pubsub_events.py
@@ -6,24 +6,24 @@ import logging
import getpass
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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)
diff --git a/examples/register_account.py b/examples/register_account.py
index 422e560..199f697 100755
--- a/examples/register_account.py
+++ b/examples/register_account.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,21 +14,21 @@ import logging
import getpass
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-class RegisterBot(sleekxmpp.ClientXMPP):
+class RegisterBot(slixmpp.ClientXMPP):
"""
A basic bot that will attempt to register an account
@@ -40,7 +40,7 @@ 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
@@ -54,7 +54,7 @@ class RegisterBot(sleekxmpp.ClientXMPP):
# 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)
diff --git a/examples/roster_browser.py b/examples/roster_browser.py
index 485ac94..1f08796 100755
--- a/examples/roster_browser.py
+++ b/examples/roster_browser.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -15,22 +15,22 @@ import getpass
import threading
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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,7 +38,7 @@ 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
diff --git a/examples/rpc_async.py b/examples/rpc_async.py
index e3e23b6..edbad55 100755
--- a/examples/rpc_async.py
+++ b/examples/rpc_async.py
@@ -2,14 +2,14 @@
# -*- 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
diff --git a/examples/rpc_client_side.py b/examples/rpc_client_side.py
index e792fc9..57c0dd5 100755
--- a/examples/rpc_client_side.py
+++ b/examples/rpc_client_side.py
@@ -2,14 +2,14 @@
# -*- 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
diff --git a/examples/rpc_server_side.py b/examples/rpc_server_side.py
index 9e8b48d..438828b 100755
--- a/examples/rpc_server_side.py
+++ b/examples/rpc_server_side.py
@@ -2,14 +2,14 @@
# -*- 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
diff --git a/examples/send_client.py b/examples/send_client.py
index 192469a..d40ac1c 100755
--- a/examples/send_client.py
+++ b/examples/send_client.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -14,28 +14,28 @@ import logging
import getpass
from optparse import OptionParser
-import sleekxmpp
+import slixmpp
# 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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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.
diff --git a/examples/set_avatar.py b/examples/set_avatar.py
index cae93c9..647bbd8 100755
--- a/examples/set_avatar.py
+++ b/examples/set_avatar.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -17,29 +17,29 @@ import getpass
import threading
from optparse import OptionParser
-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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.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)
diff --git a/examples/thirdparty_auth.py b/examples/thirdparty_auth.py
index f4d5c40..94d4a02 100755
--- a/examples/thirdparty_auth.py
+++ b/examples/thirdparty_auth.py
@@ -2,9 +2,9 @@
# -*- 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.
"""
@@ -21,24 +21,24 @@ except ImportError:
from urllib.parse import urlencode
from http.client import HTTPSConnection
-import sleekxmpp
-from sleekxmpp.xmlstream import JID
+import slixmpp
+from slixmpp.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
+# throughout Slixmpp, we will set the default encoding
# ourselves to UTF-8.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
else:
raw_input = input
-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 +46,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 +55,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
diff --git a/examples/user_location.py b/examples/user_location.py
index 2a64cad..1ef7866 100755
--- a/examples/user_location.py
+++ b/examples/user_location.py
@@ -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):
diff --git a/examples/user_tune.py b/examples/user_tune.py
index 09e050f..afaa0c2 100755
--- a/examples/user_tune.py
+++ b/examples/user_tune.py
@@ -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):
diff --git a/setup.py b/setup.py
index cc4fdd5..395fcc0 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ except ImportError:
# from ez_setup import use_setuptools
from testall import TestCommand
-from sleekxmpp.version import __version__
+from slixmpp.version import __version__
# if 'cygwin' in sys.platform.lower():
# min_version = '0.6c6'
# else:
@@ -31,7 +31,7 @@ from sleekxmpp.version import __version__
# from setuptools import setup, find_packages, Extension, Feature
VERSION = __version__
-DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
+DESCRIPTION = 'Slixmpp 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)
@@ -46,107 +46,107 @@ CLASSIFIERS = [ 'Intended Audience :: Developers',
'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/xep_0323',
- 'sleekxmpp/plugins/xep_0323/stanza',
- 'sleekxmpp/plugins/xep_0325',
- 'sleekxmpp/plugins/xep_0325/stanza',
- '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 = [ 'slixmpp',
+ 'slixmpp/stanza',
+ 'slixmpp/test',
+ 'slixmpp/roster',
+ 'slixmpp/util',
+ 'slixmpp/util/sasl',
+ 'slixmpp/xmlstream',
+ 'slixmpp/xmlstream/matcher',
+ 'slixmpp/xmlstream/handler',
+ 'slixmpp/plugins',
+ 'slixmpp/plugins/xep_0004',
+ 'slixmpp/plugins/xep_0004/stanza',
+ 'slixmpp/plugins/xep_0009',
+ 'slixmpp/plugins/xep_0009/stanza',
+ 'slixmpp/plugins/xep_0012',
+ 'slixmpp/plugins/xep_0013',
+ 'slixmpp/plugins/xep_0016',
+ 'slixmpp/plugins/xep_0020',
+ 'slixmpp/plugins/xep_0027',
+ 'slixmpp/plugins/xep_0030',
+ 'slixmpp/plugins/xep_0030/stanza',
+ 'slixmpp/plugins/xep_0033',
+ 'slixmpp/plugins/xep_0047',
+ 'slixmpp/plugins/xep_0048',
+ 'slixmpp/plugins/xep_0049',
+ 'slixmpp/plugins/xep_0050',
+ 'slixmpp/plugins/xep_0054',
+ 'slixmpp/plugins/xep_0059',
+ 'slixmpp/plugins/xep_0060',
+ 'slixmpp/plugins/xep_0060/stanza',
+ 'slixmpp/plugins/xep_0065',
+ 'slixmpp/plugins/xep_0066',
+ 'slixmpp/plugins/xep_0071',
+ 'slixmpp/plugins/xep_0077',
+ 'slixmpp/plugins/xep_0078',
+ 'slixmpp/plugins/xep_0080',
+ 'slixmpp/plugins/xep_0084',
+ 'slixmpp/plugins/xep_0085',
+ 'slixmpp/plugins/xep_0086',
+ 'slixmpp/plugins/xep_0091',
+ 'slixmpp/plugins/xep_0092',
+ 'slixmpp/plugins/xep_0095',
+ 'slixmpp/plugins/xep_0096',
+ 'slixmpp/plugins/xep_0107',
+ 'slixmpp/plugins/xep_0108',
+ 'slixmpp/plugins/xep_0115',
+ 'slixmpp/plugins/xep_0118',
+ 'slixmpp/plugins/xep_0128',
+ 'slixmpp/plugins/xep_0131',
+ 'slixmpp/plugins/xep_0152',
+ 'slixmpp/plugins/xep_0153',
+ 'slixmpp/plugins/xep_0172',
+ 'slixmpp/plugins/xep_0184',
+ 'slixmpp/plugins/xep_0186',
+ 'slixmpp/plugins/xep_0191',
+ 'slixmpp/plugins/xep_0196',
+ 'slixmpp/plugins/xep_0198',
+ 'slixmpp/plugins/xep_0199',
+ 'slixmpp/plugins/xep_0202',
+ 'slixmpp/plugins/xep_0203',
+ 'slixmpp/plugins/xep_0221',
+ 'slixmpp/plugins/xep_0224',
+ 'slixmpp/plugins/xep_0231',
+ 'slixmpp/plugins/xep_0235',
+ 'slixmpp/plugins/xep_0249',
+ 'slixmpp/plugins/xep_0257',
+ 'slixmpp/plugins/xep_0258',
+ 'slixmpp/plugins/xep_0279',
+ 'slixmpp/plugins/xep_0280',
+ 'slixmpp/plugins/xep_0297',
+ 'slixmpp/plugins/xep_0308',
+ 'slixmpp/plugins/xep_0313',
+ 'slixmpp/plugins/xep_0319',
+ 'slixmpp/plugins/xep_0323',
+ 'slixmpp/plugins/xep_0323/stanza',
+ 'slixmpp/plugins/xep_0325',
+ 'slixmpp/plugins/xep_0325/stanza',
+ 'slixmpp/plugins/google',
+ 'slixmpp/plugins/google/gmail',
+ 'slixmpp/plugins/google/auth',
+ 'slixmpp/plugins/google/settings',
+ 'slixmpp/plugins/google/nosave',
+ 'slixmpp/features',
+ 'slixmpp/features/feature_mechanisms',
+ 'slixmpp/features/feature_mechanisms/stanza',
+ 'slixmpp/features/feature_starttls',
+ 'slixmpp/features/feature_bind',
+ 'slixmpp/features/feature_session',
+ 'slixmpp/features/feature_rosterver',
+ 'slixmpp/features/feature_preapproval',
+ 'slixmpp/thirdparty',
]
setup(
- name = "sleekxmpp",
+ name = "slixmpp",
version = VERSION,
description = DESCRIPTION,
long_description = LONG_DESCRIPTION,
author = 'Nathanael Fritz',
author_email = 'fritzy [at] netflint.net',
- url = 'http://github.com/fritzy/SleekXMPP',
+ url = 'http://github.com/fritzy/Slixmpp',
license = 'MIT',
platforms = [ 'any' ],
packages = packages,
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py
deleted file mode 100644
index 85ee32b..0000000
--- a/sleekxmpp/__init__.py
+++ /dev/null
@@ -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__
diff --git a/sleekxmpp/features/feature_bind/__init__.py b/sleekxmpp/features/feature_bind/__init__.py
deleted file mode 100644
index 9e0831d..0000000
--- a/sleekxmpp/features/feature_bind/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/features/feature_mechanisms/__init__.py b/sleekxmpp/features/feature_mechanisms/__init__.py
deleted file mode 100644
index 9f7611e..0000000
--- a/sleekxmpp/features/feature_mechanisms/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/__init__.py b/sleekxmpp/features/feature_mechanisms/stanza/__init__.py
deleted file mode 100644
index 38991d8..0000000
--- a/sleekxmpp/features/feature_mechanisms/stanza/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/features/feature_preapproval/__init__.py b/sleekxmpp/features/feature_preapproval/__init__.py
deleted file mode 100644
index ae8b6b7..0000000
--- a/sleekxmpp/features/feature_preapproval/__init__.py
+++ /dev/null
@@ -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)
diff --git a/sleekxmpp/features/feature_rosterver/__init__.py b/sleekxmpp/features/feature_rosterver/__init__.py
deleted file mode 100644
index 33bbf41..0000000
--- a/sleekxmpp/features/feature_rosterver/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/features/feature_session/__init__.py b/sleekxmpp/features/feature_session/__init__.py
deleted file mode 100644
index 28bb3f7..0000000
--- a/sleekxmpp/features/feature_session/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/features/feature_starttls/__init__.py b/sleekxmpp/features/feature_starttls/__init__.py
deleted file mode 100644
index 68697ce..0000000
--- a/sleekxmpp/features/feature_starttls/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/google/auth/__init__.py b/sleekxmpp/plugins/google/auth/__init__.py
deleted file mode 100644
index 5a8feb0..0000000
--- a/sleekxmpp/plugins/google/auth/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/google/gmail/__init__.py b/sleekxmpp/plugins/google/gmail/__init__.py
deleted file mode 100644
index a92e363..0000000
--- a/sleekxmpp/plugins/google/gmail/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/google/nosave/__init__.py b/sleekxmpp/plugins/google/nosave/__init__.py
deleted file mode 100644
index 57847af..0000000
--- a/sleekxmpp/plugins/google/nosave/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/google/settings/__init__.py b/sleekxmpp/plugins/google/settings/__init__.py
deleted file mode 100644
index c3a0471..0000000
--- a/sleekxmpp/plugins/google/settings/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0004/__init__.py b/sleekxmpp/plugins/xep_0004/__init__.py
deleted file mode 100644
index 2cd18ec..0000000
--- a/sleekxmpp/plugins/xep_0004/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0004/stanza/__init__.py b/sleekxmpp/plugins/xep_0004/stanza/__init__.py
deleted file mode 100644
index 6ad3529..0000000
--- a/sleekxmpp/plugins/xep_0004/stanza/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0009/__init__.py b/sleekxmpp/plugins/xep_0009/__init__.py
deleted file mode 100644
index 0ce3cf2..0000000
--- a/sleekxmpp/plugins/xep_0009/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0009/stanza/__init__.py b/sleekxmpp/plugins/xep_0009/stanza/__init__.py
deleted file mode 100644
index 5dcbf33..0000000
--- a/sleekxmpp/plugins/xep_0009/stanza/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0012/__init__.py b/sleekxmpp/plugins/xep_0012/__init__.py
deleted file mode 100644
index 6b778fc..0000000
--- a/sleekxmpp/plugins/xep_0012/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0013/__init__.py b/sleekxmpp/plugins/xep_0013/__init__.py
deleted file mode 100644
index ad40094..0000000
--- a/sleekxmpp/plugins/xep_0013/__init__.py
+++ /dev/null
@@ -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)
diff --git a/sleekxmpp/plugins/xep_0016/__init__.py b/sleekxmpp/plugins/xep_0016/__init__.py
deleted file mode 100644
index 06704d2..0000000
--- a/sleekxmpp/plugins/xep_0016/__init__.py
+++ /dev/null
@@ -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)
diff --git a/sleekxmpp/plugins/xep_0020/__init__.py b/sleekxmpp/plugins/xep_0020/__init__.py
deleted file mode 100644
index c6aafe9..0000000
--- a/sleekxmpp/plugins/xep_0020/__init__.py
+++ /dev/null
@@ -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)
diff --git a/sleekxmpp/plugins/xep_0027/__init__.py b/sleekxmpp/plugins/xep_0027/__init__.py
deleted file mode 100644
index b6ed967..0000000
--- a/sleekxmpp/plugins/xep_0027/__init__.py
+++ /dev/null
@@ -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)
diff --git a/sleekxmpp/plugins/xep_0030/__init__.py b/sleekxmpp/plugins/xep_0030/__init__.py
deleted file mode 100644
index 0d1de65..0000000
--- a/sleekxmpp/plugins/xep_0030/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0030/stanza/__init__.py b/sleekxmpp/plugins/xep_0030/stanza/__init__.py
deleted file mode 100644
index 0d97cf3..0000000
--- a/sleekxmpp/plugins/xep_0030/stanza/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0033/__init__.py b/sleekxmpp/plugins/xep_0033/__init__.py
deleted file mode 100644
index ba8152c..0000000
--- a/sleekxmpp/plugins/xep_0033/__init__.py
+++ /dev/null
@@ -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
diff --git a/sleekxmpp/plugins/xep_0047/__init__.py b/sleekxmpp/plugins/xep_0047/__init__.py
deleted file mode 100644
index 5cd7df2..0000000
--- a/sleekxmpp/plugins/xep_0047/__init__.py
+++ /dev/null
@@ -1,21 +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_0047 import stanza
-from sleekxmpp.plugins.xep_0047.stanza import Open, Close, Data
-from sleekxmpp.plugins.xep_0047.stream import IBBytestream
-from sleekxmpp.plugins.xep_0047.ibb import XEP_0047
-
-
-register_plugin(XEP_0047)
-
-
-# Retain some backwards compatibility
-xep_0047 = XEP_0047
diff --git a/sleekxmpp/plugins/xep_0048/__init__.py b/sleekxmpp/plugins/xep_0048/__init__.py
deleted file mode 100644
index 2c98d06..0000000
--- a/sleekxmpp/plugins/xep_0048/__init__.py
+++ /dev/null
@@ -1,15 +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_0048.stanza import Bookmarks, Conference, URL
-from sleekxmpp.plugins.xep_0048.bookmarks import XEP_0048
-
-
-register_plugin(XEP_0048)
diff --git a/sleekxmpp/plugins/xep_0049/__init__.py b/sleekxmpp/plugins/xep_0049/__init__.py
deleted file mode 100644
index b0c4f90..0000000
--- a/sleekxmpp/plugins/xep_0049/__init__.py
+++ /dev/null
@@ -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_0049.stanza import PrivateXML
-from sleekxmpp.plugins.xep_0049.private_storage import XEP_0049
-
-
-register_plugin(XEP_0049)
diff --git a/sleekxmpp/plugins/xep_0050/__init__.py b/sleekxmpp/plugins/xep_0050/__init__.py
deleted file mode 100644
index 640b182..0000000
--- a/sleekxmpp/plugins/xep_0050/__init__.py
+++ /dev/null
@@ -1,19 +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_0050.stanza import Command
-from sleekxmpp.plugins.xep_0050.adhoc import XEP_0050
-
-
-register_plugin(XEP_0050)
-
-
-# Retain some backwards compatibility
-xep_0050 = XEP_0050
diff --git a/sleekxmpp/plugins/xep_0054/__init__.py b/sleekxmpp/plugins/xep_0054/__init__.py
deleted file mode 100644
index d460cc8..0000000
--- a/sleekxmpp/plugins/xep_0054/__init__.py
+++ /dev/null
@@ -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_0054.stanza import VCardTemp
-from sleekxmpp.plugins.xep_0054.vcard_temp import XEP_0054
-
-
-register_plugin(XEP_0054)
diff --git a/sleekxmpp/plugins/xep_0059/__init__.py b/sleekxmpp/plugins/xep_0059/__init__.py
deleted file mode 100644
index 3464ce3..0000000
--- a/sleekxmpp/plugins/xep_0059/__init__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
- SleekXMPP: The Sleek XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of SleekXMPP.
-
- See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0059.stanza import Set
-from sleekxmpp.plugins.xep_0059.rsm import ResultIterator, XEP_0059
-
-
-register_plugin(XEP_0059)
-
-# Retain some backwards compatibility
-xep_0059 = XEP_0059
diff --git a/sleekxmpp/plugins/xep_0060/__init__.py b/sleekxmpp/plugins/xep_0060/__init__.py
deleted file mode 100644
index 86e2f47..0000000
--- a/sleekxmpp/plugins/xep_0060/__init__.py
+++ /dev/null
@@ -1,19 +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_0060.pubsub import XEP_0060
-from sleekxmpp.plugins.xep_0060 import stanza
-
-
-register_plugin(XEP_0060)
-
-
-# Retain some backwards compatibility
-xep_0060 = XEP_0060
diff --git a/sleekxmpp/plugins/xep_0060/stanza/__init__.py b/sleekxmpp/plugins/xep_0060/stanza/__init__.py
deleted file mode 100644
index 37f52f0..0000000
--- a/sleekxmpp/plugins/xep_0060/stanza/__init__.py
+++ /dev/null
@@ -1,12 +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.xep_0060.stanza.pubsub import *
-from sleekxmpp.plugins.xep_0060.stanza.pubsub_owner import *
-from sleekxmpp.plugins.xep_0060.stanza.pubsub_event import *
-from sleekxmpp.plugins.xep_0060.stanza.pubsub_errors import *
diff --git a/sleekxmpp/plugins/xep_0065/__init__.py b/sleekxmpp/plugins/xep_0065/__init__.py
deleted file mode 100644
index feca2ef..0000000
--- a/sleekxmpp/plugins/xep_0065/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0065.stanza import Socks5
-from sleekxmpp.plugins.xep_0065.proxy import XEP_0065
-
-
-register_plugin(XEP_0065)
diff --git a/sleekxmpp/plugins/xep_0066/__init__.py b/sleekxmpp/plugins/xep_0066/__init__.py
deleted file mode 100644
index 68a5018..0000000
--- a/sleekxmpp/plugins/xep_0066/__init__.py
+++ /dev/null
@@ -1,20 +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_0066 import stanza
-from sleekxmpp.plugins.xep_0066.stanza import OOB, OOBTransfer
-from sleekxmpp.plugins.xep_0066.oob import XEP_0066
-
-
-register_plugin(XEP_0066)
-
-
-# Retain some backwards compatibility
-xep_0066 = XEP_0066
diff --git a/sleekxmpp/plugins/xep_0071/__init__.py b/sleekxmpp/plugins/xep_0071/__init__.py
deleted file mode 100644
index c21e926..0000000
--- a/sleekxmpp/plugins/xep_0071/__init__.py
+++ /dev/null
@@ -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_0071.stanza import XHTML_IM
-from sleekxmpp.plugins.xep_0071.xhtml_im import XEP_0071
-
-
-register_plugin(XEP_0071)
diff --git a/sleekxmpp/plugins/xep_0077/__init__.py b/sleekxmpp/plugins/xep_0077/__init__.py
deleted file mode 100644
index 779ae0a..0000000
--- a/sleekxmpp/plugins/xep_0077/__init__.py
+++ /dev/null
@@ -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_0077.stanza import Register, RegisterFeature
-from sleekxmpp.plugins.xep_0077.register import XEP_0077
-
-
-register_plugin(XEP_0077)
-
-
-# Retain some backwards compatibility
-xep_0077 = XEP_0077
diff --git a/sleekxmpp/plugins/xep_0078/__init__.py b/sleekxmpp/plugins/xep_0078/__init__.py
deleted file mode 100644
index 2ea72ff..0000000
--- a/sleekxmpp/plugins/xep_0078/__init__.py
+++ /dev/null
@@ -1,20 +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_0078 import stanza
-from sleekxmpp.plugins.xep_0078.stanza import IqAuth, AuthFeature
-from sleekxmpp.plugins.xep_0078.legacyauth import XEP_0078
-
-
-register_plugin(XEP_0078)
-
-
-# Retain some backwards compatibility
-xep_0078 = XEP_0078
diff --git a/sleekxmpp/plugins/xep_0080/__init__.py b/sleekxmpp/plugins/xep_0080/__init__.py
deleted file mode 100644
index cad23d2..0000000
--- a/sleekxmpp/plugins/xep_0080/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""
- SleekXMPP: The Sleek XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of SleekXMPP.
-
- See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0080.stanza import Geoloc
-from sleekxmpp.plugins.xep_0080.geoloc import XEP_0080
-
-
-register_plugin(XEP_0080)
diff --git a/sleekxmpp/plugins/xep_0084/__init__.py b/sleekxmpp/plugins/xep_0084/__init__.py
deleted file mode 100644
index 6b87573..0000000
--- a/sleekxmpp/plugins/xep_0084/__init__.py
+++ /dev/null
@@ -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_0084 import stanza
-from sleekxmpp.plugins.xep_0084.stanza import Data, MetaData
-from sleekxmpp.plugins.xep_0084.avatar import XEP_0084
-
-
-register_plugin(XEP_0084)
diff --git a/sleekxmpp/plugins/xep_0085/__init__.py b/sleekxmpp/plugins/xep_0085/__init__.py
deleted file mode 100644
index 445d505..0000000
--- a/sleekxmpp/plugins/xep_0085/__init__.py
+++ /dev/null
@@ -1,19 +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 permissio
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0085.stanza import ChatState
-from sleekxmpp.plugins.xep_0085.chat_states import XEP_0085
-
-
-register_plugin(XEP_0085)
-
-
-# Retain some backwards compatibility
-xep_0085 = XEP_0085
diff --git a/sleekxmpp/plugins/xep_0086/__init__.py b/sleekxmpp/plugins/xep_0086/__init__.py
deleted file mode 100644
index 94600e8..0000000
--- a/sleekxmpp/plugins/xep_0086/__init__.py
+++ /dev/null
@@ -1,19 +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_0086.stanza import LegacyError
-from sleekxmpp.plugins.xep_0086.legacy_error import XEP_0086
-
-
-register_plugin(XEP_0086)
-
-
-# Retain some backwards compatibility
-xep_0086 = XEP_0086
diff --git a/sleekxmpp/plugins/xep_0091/__init__.py b/sleekxmpp/plugins/xep_0091/__init__.py
deleted file mode 100644
index 04f21ef..0000000
--- a/sleekxmpp/plugins/xep_0091/__init__.py
+++ /dev/null
@@ -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_0091 import stanza
-from sleekxmpp.plugins.xep_0091.stanza import LegacyDelay
-from sleekxmpp.plugins.xep_0091.legacy_delay import XEP_0091
-
-
-register_plugin(XEP_0091)
diff --git a/sleekxmpp/plugins/xep_0092/__init__.py b/sleekxmpp/plugins/xep_0092/__init__.py
deleted file mode 100644
index 293eaae..0000000
--- a/sleekxmpp/plugins/xep_0092/__init__.py
+++ /dev/null
@@ -1,20 +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_0092 import stanza
-from sleekxmpp.plugins.xep_0092.stanza import Version
-from sleekxmpp.plugins.xep_0092.version import XEP_0092
-
-
-register_plugin(XEP_0092)
-
-
-# Retain some backwards compatibility
-xep_0092 = XEP_0092
diff --git a/sleekxmpp/plugins/xep_0095/__init__.py b/sleekxmpp/plugins/xep_0095/__init__.py
deleted file mode 100644
index 4465ef5..0000000
--- a/sleekxmpp/plugins/xep_0095/__init__.py
+++ /dev/null
@@ -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_0095 import stanza
-from sleekxmpp.plugins.xep_0095.stanza import SI
-from sleekxmpp.plugins.xep_0095.stream_initiation import XEP_0095
-
-
-register_plugin(XEP_0095)
diff --git a/sleekxmpp/plugins/xep_0096/__init__.py b/sleekxmpp/plugins/xep_0096/__init__.py
deleted file mode 100644
index 5f83616..0000000
--- a/sleekxmpp/plugins/xep_0096/__init__.py
+++ /dev/null
@@ -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_0096 import stanza
-from sleekxmpp.plugins.xep_0096.stanza import File
-from sleekxmpp.plugins.xep_0096.file_transfer import XEP_0096
-
-
-register_plugin(XEP_0096)
diff --git a/sleekxmpp/plugins/xep_0107/__init__.py b/sleekxmpp/plugins/xep_0107/__init__.py
deleted file mode 100644
index 04302df..0000000
--- a/sleekxmpp/plugins/xep_0107/__init__.py
+++ /dev/null
@@ -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_0107 import stanza
-from sleekxmpp.plugins.xep_0107.stanza import UserMood
-from sleekxmpp.plugins.xep_0107.user_mood import XEP_0107
-
-
-register_plugin(XEP_0107)
diff --git a/sleekxmpp/plugins/xep_0108/__init__.py b/sleekxmpp/plugins/xep_0108/__init__.py
deleted file mode 100644
index 34d4511..0000000
--- a/sleekxmpp/plugins/xep_0108/__init__.py
+++ /dev/null
@@ -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_0108 import stanza
-from sleekxmpp.plugins.xep_0108.stanza import UserActivity
-from sleekxmpp.plugins.xep_0108.user_activity import XEP_0108
-
-
-register_plugin(XEP_0108)
diff --git a/sleekxmpp/plugins/xep_0115/__init__.py b/sleekxmpp/plugins/xep_0115/__init__.py
deleted file mode 100644
index 31a2c03..0000000
--- a/sleekxmpp/plugins/xep_0115/__init__.py
+++ /dev/null
@@ -1,20 +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_0115.stanza import Capabilities
-from sleekxmpp.plugins.xep_0115.static import StaticCaps
-from sleekxmpp.plugins.xep_0115.caps import XEP_0115
-
-
-register_plugin(XEP_0115)
-
-
-# Retain some backwards compatibility
-xep_0115 = XEP_0115
diff --git a/sleekxmpp/plugins/xep_0118/__init__.py b/sleekxmpp/plugins/xep_0118/__init__.py
deleted file mode 100644
index 565f784..0000000
--- a/sleekxmpp/plugins/xep_0118/__init__.py
+++ /dev/null
@@ -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_0118 import stanza
-from sleekxmpp.plugins.xep_0118.stanza import UserTune
-from sleekxmpp.plugins.xep_0118.user_tune import XEP_0118
-
-
-register_plugin(XEP_0118)
diff --git a/sleekxmpp/plugins/xep_0128/__init__.py b/sleekxmpp/plugins/xep_0128/__init__.py
deleted file mode 100644
index 27c2cc3..0000000
--- a/sleekxmpp/plugins/xep_0128/__init__.py
+++ /dev/null
@@ -1,19 +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_0128.static import StaticExtendedDisco
-from sleekxmpp.plugins.xep_0128.extended_disco import XEP_0128
-
-
-register_plugin(XEP_0128)
-
-
-# Retain some backwards compatibility
-xep_0128 = XEP_0128
diff --git a/sleekxmpp/plugins/xep_0131/__init__.py b/sleekxmpp/plugins/xep_0131/__init__.py
deleted file mode 100644
index ec71c98..0000000
--- a/sleekxmpp/plugins/xep_0131/__init__.py
+++ /dev/null
@@ -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_0131 import stanza
-from sleekxmpp.plugins.xep_0131.stanza import Headers
-from sleekxmpp.plugins.xep_0131.headers import XEP_0131
-
-
-register_plugin(XEP_0131)
diff --git a/sleekxmpp/plugins/xep_0152/__init__.py b/sleekxmpp/plugins/xep_0152/__init__.py
deleted file mode 100644
index 7de031b..0000000
--- a/sleekxmpp/plugins/xep_0152/__init__.py
+++ /dev/null
@@ -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_0152 import stanza
-from sleekxmpp.plugins.xep_0152.stanza import Reachability
-from sleekxmpp.plugins.xep_0152.reachability import XEP_0152
-
-
-register_plugin(XEP_0152)
diff --git a/sleekxmpp/plugins/xep_0153/__init__.py b/sleekxmpp/plugins/xep_0153/__init__.py
deleted file mode 100644
index f52b771..0000000
--- a/sleekxmpp/plugins/xep_0153/__init__.py
+++ /dev/null
@@ -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_0153.stanza import VCardTempUpdate
-from sleekxmpp.plugins.xep_0153.vcard_avatar import XEP_0153
-
-
-register_plugin(XEP_0153)
diff --git a/sleekxmpp/plugins/xep_0172/__init__.py b/sleekxmpp/plugins/xep_0172/__init__.py
deleted file mode 100644
index aa7b9f7..0000000
--- a/sleekxmpp/plugins/xep_0172/__init__.py
+++ /dev/null
@@ -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_0172 import stanza
-from sleekxmpp.plugins.xep_0172.stanza import UserNick
-from sleekxmpp.plugins.xep_0172.user_nick import XEP_0172
-
-
-register_plugin(XEP_0172)
diff --git a/sleekxmpp/plugins/xep_0184/__init__.py b/sleekxmpp/plugins/xep_0184/__init__.py
deleted file mode 100644
index 4b129b6..0000000
--- a/sleekxmpp/plugins/xep_0184/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
- SleekXMPP: The Sleek XMPP Library
- Copyright (C) 2012 Erik Reuterborg Larsson, 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.plugins.xep_0184.stanza import Request, Received
-from sleekxmpp.plugins.xep_0184.receipt import XEP_0184
-
-
-register_plugin(XEP_0184)
-
-
-# Retain some backwards compatibility
-xep_0184 = XEP_0184
diff --git a/sleekxmpp/plugins/xep_0186/__init__.py b/sleekxmpp/plugins/xep_0186/__init__.py
deleted file mode 100644
index c9b8c6b..0000000
--- a/sleekxmpp/plugins/xep_0186/__init__.py
+++ /dev/null
@@ -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_0186 import stanza
-from sleekxmpp.plugins.xep_0186.stanza import Invisible, Visible
-from sleekxmpp.plugins.xep_0186.invisible_command import XEP_0186
-
-
-register_plugin(XEP_0186)
diff --git a/sleekxmpp/plugins/xep_0191/__init__.py b/sleekxmpp/plugins/xep_0191/__init__.py
deleted file mode 100644
index 934ac63..0000000
--- a/sleekxmpp/plugins/xep_0191/__init__.py
+++ /dev/null
@@ -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_0191.stanza import Block, Unblock, BlockList
-from sleekxmpp.plugins.xep_0191.blocking import XEP_0191
-
-
-register_plugin(XEP_0191)
diff --git a/sleekxmpp/plugins/xep_0196/__init__.py b/sleekxmpp/plugins/xep_0196/__init__.py
deleted file mode 100644
index 7aeaf6c..0000000
--- a/sleekxmpp/plugins/xep_0196/__init__.py
+++ /dev/null
@@ -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_0196 import stanza
-from sleekxmpp.plugins.xep_0196.stanza import UserGaming
-from sleekxmpp.plugins.xep_0196.user_gaming import XEP_0196
-
-
-register_plugin(XEP_0196)
diff --git a/sleekxmpp/plugins/xep_0198/__init__.py b/sleekxmpp/plugins/xep_0198/__init__.py
deleted file mode 100644
index db93034..0000000
--- a/sleekxmpp/plugins/xep_0198/__init__.py
+++ /dev/null
@@ -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_0198.stanza import Enable, Enabled
-from sleekxmpp.plugins.xep_0198.stanza import Resume, Resumed
-from sleekxmpp.plugins.xep_0198.stanza import Failed
-from sleekxmpp.plugins.xep_0198.stanza import StreamManagement
-from sleekxmpp.plugins.xep_0198.stanza import Ack, RequestAck
-
-from sleekxmpp.plugins.xep_0198.stream_management import XEP_0198
-
-
-register_plugin(XEP_0198)
diff --git a/sleekxmpp/plugins/xep_0199/__init__.py b/sleekxmpp/plugins/xep_0199/__init__.py
deleted file mode 100644
index 5231a5b..0000000
--- a/sleekxmpp/plugins/xep_0199/__init__.py
+++ /dev/null
@@ -1,20 +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.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0199.stanza import Ping
-from sleekxmpp.plugins.xep_0199.ping import XEP_0199
-
-
-register_plugin(XEP_0199)
-
-
-# Backwards compatibility for names
-xep_0199 = XEP_0199
-xep_0199.sendPing = xep_0199.send_ping
diff --git a/sleekxmpp/plugins/xep_0202/__init__.py b/sleekxmpp/plugins/xep_0202/__init__.py
deleted file mode 100644
index cdab366..0000000
--- a/sleekxmpp/plugins/xep_0202/__init__.py
+++ /dev/null
@@ -1,20 +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_0202 import stanza
-from sleekxmpp.plugins.xep_0202.stanza import EntityTime
-from sleekxmpp.plugins.xep_0202.time import XEP_0202
-
-
-register_plugin(XEP_0202)
-
-
-# Retain some backwards compatibility
-xep_0202 = XEP_0202
diff --git a/sleekxmpp/plugins/xep_0203/__init__.py b/sleekxmpp/plugins/xep_0203/__init__.py
deleted file mode 100644
index a95ead7..0000000
--- a/sleekxmpp/plugins/xep_0203/__init__.py
+++ /dev/null
@@ -1,19 +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_0203 import stanza
-from sleekxmpp.plugins.xep_0203.stanza import Delay
-from sleekxmpp.plugins.xep_0203.delay import XEP_0203
-
-
-register_plugin(XEP_0203)
-
-# Retain some backwards compatibility
-xep_0203 = XEP_0203
diff --git a/sleekxmpp/plugins/xep_0221/__init__.py b/sleekxmpp/plugins/xep_0221/__init__.py
deleted file mode 100644
index 91341f5..0000000
--- a/sleekxmpp/plugins/xep_0221/__init__.py
+++ /dev/null
@@ -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_0221 import stanza
-from sleekxmpp.plugins.xep_0221.stanza import Media, URI
-from sleekxmpp.plugins.xep_0221.media import XEP_0221
-
-
-register_plugin(XEP_0221)
diff --git a/sleekxmpp/plugins/xep_0224/__init__.py b/sleekxmpp/plugins/xep_0224/__init__.py
deleted file mode 100644
index 1a9d234..0000000
--- a/sleekxmpp/plugins/xep_0224/__init__.py
+++ /dev/null
@@ -1,20 +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_0224 import stanza
-from sleekxmpp.plugins.xep_0224.stanza import Attention
-from sleekxmpp.plugins.xep_0224.attention import XEP_0224
-
-
-register_plugin(XEP_0224)
-
-
-# Retain some backwards compatibility
-xep_0224 = XEP_0224
diff --git a/sleekxmpp/plugins/xep_0231/__init__.py b/sleekxmpp/plugins/xep_0231/__init__.py
deleted file mode 100644
index 2861d67..0000000
--- a/sleekxmpp/plugins/xep_0231/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
- SleekXMPP: The Sleek XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz,
- Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of SleekXMPP.
-
- See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0231.stanza import BitsOfBinary
-from sleekxmpp.plugins.xep_0231.bob import XEP_0231
-
-
-register_plugin(XEP_0231)
diff --git a/sleekxmpp/plugins/xep_0235/__init__.py b/sleekxmpp/plugins/xep_0235/__init__.py
deleted file mode 100644
index 29d4408..0000000
--- a/sleekxmpp/plugins/xep_0235/__init__.py
+++ /dev/null
@@ -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_0235 import stanza
-from sleekxmpp.plugins.xep_0235.stanza import OAuth
-from sleekxmpp.plugins.xep_0235.oauth import XEP_0235
-
-
-register_plugin(XEP_0235)
diff --git a/sleekxmpp/plugins/xep_0249/__init__.py b/sleekxmpp/plugins/xep_0249/__init__.py
deleted file mode 100644
index b85f55c..0000000
--- a/sleekxmpp/plugins/xep_0249/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
- SleekXMPP: The Sleek XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dalek
- This file is part of SleekXMPP.
-
- See the file LICENSE for copying permission.
-"""
-
-from sleekxmpp.plugins.base import register_plugin
-
-from sleekxmpp.plugins.xep_0249.stanza import Invite
-from sleekxmpp.plugins.xep_0249.invite import XEP_0249
-
-
-register_plugin(XEP_0249)
-
-
-# Retain some backwards compatibility
-xep_0249 = XEP_0249
diff --git a/sleekxmpp/plugins/xep_0257/__init__.py b/sleekxmpp/plugins/xep_0257/__init__.py
deleted file mode 100644
index 8c5311f..0000000
--- a/sleekxmpp/plugins/xep_0257/__init__.py
+++ /dev/null
@@ -1,17 +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_0257 import stanza
-from sleekxmpp.plugins.xep_0257.stanza import Certs, AppendCert
-from sleekxmpp.plugins.xep_0257.stanza import DisableCert, RevokeCert
-from sleekxmpp.plugins.xep_0257.client_cert_management import XEP_0257
-
-
-register_plugin(XEP_0257)
diff --git a/sleekxmpp/plugins/xep_0258/__init__.py b/sleekxmpp/plugins/xep_0258/__init__.py
deleted file mode 100644
index 516a370..0000000
--- a/sleekxmpp/plugins/xep_0258/__init__.py
+++ /dev/null
@@ -1,18 +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_0258 import stanza
-from sleekxmpp.plugins.xep_0258.stanza import SecurityLabel, Label
-from sleekxmpp.plugins.xep_0258.stanza import DisplayMarking, EquivalentLabel
-from sleekxmpp.plugins.xep_0258.stanza import ESSLabel, Catalog, CatalogItem
-from sleekxmpp.plugins.xep_0258.security_labels import XEP_0258
-
-
-register_plugin(XEP_0258)
diff --git a/sleekxmpp/plugins/xep_0279/__init__.py b/sleekxmpp/plugins/xep_0279/__init__.py
deleted file mode 100644
index 93db9e7..0000000
--- a/sleekxmpp/plugins/xep_0279/__init__.py
+++ /dev/null
@@ -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_0279 import stanza
-from sleekxmpp.plugins.xep_0279.stanza import IPCheck
-from sleekxmpp.plugins.xep_0279.ipcheck import XEP_0279
-
-
-register_plugin(XEP_0279)
diff --git a/sleekxmpp/plugins/xep_0280/__init__.py b/sleekxmpp/plugins/xep_0280/__init__.py
deleted file mode 100644
index 929321a..0000000
--- a/sleekxmpp/plugins/xep_0280/__init__.py
+++ /dev/null
@@ -1,17 +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_0280.stanza import ReceivedCarbon, SentCarbon
-from sleekxmpp.plugins.xep_0280.stanza import PrivateCarbon
-from sleekxmpp.plugins.xep_0280.stanza import CarbonEnable, CarbonDisable
-from sleekxmpp.plugins.xep_0280.carbons import XEP_0280
-
-
-register_plugin(XEP_0280)
diff --git a/sleekxmpp/plugins/xep_0297/__init__.py b/sleekxmpp/plugins/xep_0297/__init__.py
deleted file mode 100644
index 551d942..0000000
--- a/sleekxmpp/plugins/xep_0297/__init__.py
+++ /dev/null
@@ -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_0297 import stanza
-from sleekxmpp.plugins.xep_0297.stanza import Forwarded
-from sleekxmpp.plugins.xep_0297.forwarded import XEP_0297
-
-
-register_plugin(XEP_0297)
diff --git a/sleekxmpp/plugins/xep_0308/__init__.py b/sleekxmpp/plugins/xep_0308/__init__.py
deleted file mode 100644
index a6a100e..0000000
--- a/sleekxmpp/plugins/xep_0308/__init__.py
+++ /dev/null
@@ -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_0308.stanza import Replace
-from sleekxmpp.plugins.xep_0308.correction import XEP_0308
-
-
-register_plugin(XEP_0308)
diff --git a/sleekxmpp/plugins/xep_0313/__init__.py b/sleekxmpp/plugins/xep_0313/__init__.py
deleted file mode 100644
index 8b6ed97..0000000
--- a/sleekxmpp/plugins/xep_0313/__init__.py
+++ /dev/null
@@ -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_0313.stanza import Result, MAM, Preferences
-from sleekxmpp.plugins.xep_0313.mam import XEP_0313
-
-
-register_plugin(XEP_0313)
diff --git a/sleekxmpp/plugins/xep_0319/__init__.py b/sleekxmpp/plugins/xep_0319/__init__.py
deleted file mode 100644
index 4756e63..0000000
--- a/sleekxmpp/plugins/xep_0319/__init__.py
+++ /dev/null
@@ -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_0319 import stanza
-from sleekxmpp.plugins.xep_0319.stanza import Idle
-from sleekxmpp.plugins.xep_0319.idle import XEP_0319
-
-
-register_plugin(XEP_0319)
diff --git a/sleekxmpp/roster/__init__.py b/sleekxmpp/roster/__init__.py
deleted file mode 100644
index 18b380c..0000000
--- a/sleekxmpp/roster/__init__.py
+++ /dev/null
@@ -1,11 +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.
-"""
-
-from sleekxmpp.roster.item import RosterItem
-from sleekxmpp.roster.single import RosterNode
-from sleekxmpp.roster.multi import Roster
diff --git a/sleekxmpp/stanza/__init__.py b/sleekxmpp/stanza/__init__.py
deleted file mode 100644
index 4bd37dc..0000000
--- a/sleekxmpp/stanza/__init__.py
+++ /dev/null
@@ -1,15 +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.
-"""
-
-
-from sleekxmpp.stanza.error import Error
-from sleekxmpp.stanza.iq import Iq
-from sleekxmpp.stanza.message import Message
-from sleekxmpp.stanza.presence import Presence
-from sleekxmpp.stanza.stream_features import StreamFeatures
-from sleekxmpp.stanza.stream_error import StreamError
diff --git a/sleekxmpp/test/__init__.py b/sleekxmpp/test/__init__.py
deleted file mode 100644
index 54d4dc5..0000000
--- a/sleekxmpp/test/__init__.py
+++ /dev/null
@@ -1,11 +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.test.mocksocket import TestSocket
-from sleekxmpp.test.livesocket import TestLiveSocket
-from sleekxmpp.test.sleektest import *
diff --git a/sleekxmpp/thirdparty/__init__.py b/sleekxmpp/thirdparty/__init__.py
deleted file mode 100644
index 2a1db71..0000000
--- a/sleekxmpp/thirdparty/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-try:
- from collections import OrderedDict
-except:
- from sleekxmpp.thirdparty.ordereddict import OrderedDict
-
-try:
- from gnupg import GPG
-except:
- from sleekxmpp.thirdparty.gnupg import GPG
-
-from sleekxmpp.thirdparty import socks
-from sleekxmpp.thirdparty.mini_dateutil import tzutc, tzoffset, parse_iso
diff --git a/sleekxmpp/xmlstream/__init__.py b/sleekxmpp/xmlstream/__init__.py
deleted file mode 100644
index 5a1ea1b..0000000
--- a/sleekxmpp/xmlstream/__init__.py
+++ /dev/null
@@ -1,19 +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.
-"""
-
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream.scheduler import Scheduler
-from sleekxmpp.xmlstream.stanzabase import StanzaBase, ElementBase, ET
-from sleekxmpp.xmlstream.stanzabase import register_stanza_plugin
-from sleekxmpp.xmlstream.tostring import tostring
-from sleekxmpp.xmlstream.xmlstream import XMLStream, RESPONSE_TIMEOUT
-from sleekxmpp.xmlstream.xmlstream import RestartStream
-
-__all__ = ['JID', 'Scheduler', 'StanzaBase', 'ElementBase',
- 'ET', 'StateMachine', 'tostring', 'XMLStream',
- 'RESPONSE_TIMEOUT', 'RestartStream']
diff --git a/sleekxmpp/xmlstream/handler/__init__.py b/sleekxmpp/xmlstream/handler/__init__.py
deleted file mode 100644
index 83c87f0..0000000
--- a/sleekxmpp/xmlstream/handler/__init__.py
+++ /dev/null
@@ -1,15 +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.
-"""
-
-from sleekxmpp.xmlstream.handler.callback import Callback
-from sleekxmpp.xmlstream.handler.collector import Collector
-from sleekxmpp.xmlstream.handler.waiter import Waiter
-from sleekxmpp.xmlstream.handler.xmlcallback import XMLCallback
-from sleekxmpp.xmlstream.handler.xmlwaiter import XMLWaiter
-
-__all__ = ['Callback', 'Waiter', 'XMLCallback', 'XMLWaiter']
diff --git a/sleekxmpp/xmlstream/jid.py b/sleekxmpp/xmlstream/jid.py
deleted file mode 100644
index 2b59db4..0000000
--- a/sleekxmpp/xmlstream/jid.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import logging
-
-logging.warning('Deprecated: sleekxmpp.xmlstream.jid is moving to sleekxmpp.jid')
-
-from sleekxmpp.jid import JID
diff --git a/sleekxmpp/xmlstream/matcher/__init__.py b/sleekxmpp/xmlstream/matcher/__init__.py
deleted file mode 100644
index aa74c43..0000000
--- a/sleekxmpp/xmlstream/matcher/__init__.py
+++ /dev/null
@@ -1,17 +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.
-"""
-
-from sleekxmpp.xmlstream.matcher.id import MatcherId
-from sleekxmpp.xmlstream.matcher.idsender import MatchIDSender
-from sleekxmpp.xmlstream.matcher.many import MatchMany
-from sleekxmpp.xmlstream.matcher.stanzapath import StanzaPath
-from sleekxmpp.xmlstream.matcher.xmlmask import MatchXMLMask
-from sleekxmpp.xmlstream.matcher.xpath import MatchXPath
-
-__all__ = ['MatcherId', 'MatchMany', 'StanzaPath',
- 'MatchXMLMask', 'MatchXPath']
diff --git a/slixmpp/__init__.py b/slixmpp/__init__.py
new file mode 100644
index 0000000..faf9dad
--- /dev/null
+++ b/slixmpp/__init__.py
@@ -0,0 +1,30 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+import logging
+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 slixmpp.stanza import Message, Presence, Iq
+from slixmpp.jid import JID, InvalidJID
+from slixmpp.xmlstream.stanzabase import ET, ElementBase, register_stanza_plugin
+from slixmpp.xmlstream.handler import *
+from slixmpp.xmlstream import XMLStream, RestartStream
+from slixmpp.xmlstream.matcher import *
+from slixmpp.basexmpp import BaseXMPP
+from slixmpp.clientxmpp import ClientXMPP
+from slixmpp.componentxmpp import ComponentXMPP
+
+from slixmpp.version import __version__, __version_info__
diff --git a/sleekxmpp/api.py b/slixmpp/api.py
index 8de61b3..f09e036 100644
--- a/sleekxmpp/api.py
+++ b/slixmpp/api.py
@@ -1,4 +1,4 @@
-from sleekxmpp.xmlstream import JID
+from slixmpp.xmlstream import JID
class APIWrapper(object):
diff --git a/sleekxmpp/basexmpp.py b/slixmpp/basexmpp.py
index bf0ae4d..0355721 100644
--- a/sleekxmpp/basexmpp.py
+++ b/slixmpp/basexmpp.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
"""
- sleekxmpp.basexmpp
+ slixmpp.basexmpp
~~~~~~~~~~~~~~~~~~
This module provides the common XMPP functionality
for both clients and components.
- Part of SleekXMPP: The Sleek XMPP Library
+ Part of Slixmpp: The Slick XMPP Library
:copyright: (c) 2011 Nathanael C. Fritz
:license: MIT, see LICENSE for more details
@@ -18,22 +18,22 @@ import sys
import logging
import threading
-from sleekxmpp import plugins, roster, stanza
-from sleekxmpp.api import APIRegistry
-from sleekxmpp.exceptions import IqError, IqTimeout
+from slixmpp import plugins, roster, stanza
+from slixmpp.api import APIRegistry
+from slixmpp.exceptions import IqError, IqTimeout
-from sleekxmpp.stanza import Message, Presence, Iq, StreamError
-from sleekxmpp.stanza.roster import Roster
-from sleekxmpp.stanza.nick import Nick
-from sleekxmpp.stanza.htmlim import HTMLIM
+from slixmpp.stanza import Message, Presence, Iq, StreamError
+from slixmpp.stanza.roster import Roster
+from slixmpp.stanza.nick import Nick
+from slixmpp.stanza.htmlim import HTMLIM
-from sleekxmpp.xmlstream import XMLStream, JID
-from sleekxmpp.xmlstream import ET, register_stanza_plugin
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.stanzabase import XML_NS
+from slixmpp.xmlstream import XMLStream, JID
+from slixmpp.xmlstream import ET, register_stanza_plugin
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.stanzabase import XML_NS
-from sleekxmpp.plugins import PluginManager, load_plugin
+from slixmpp.plugins import PluginManager, load_plugin
log = logging.getLogger(__name__)
@@ -41,7 +41,7 @@ log = logging.getLogger(__name__)
# In order to make sure that Unicode is handled properly
# in Python 2.x, reset the default encoding.
if sys.version_info < (3, 0):
- from sleekxmpp.util.misc_ops import setdefaultencoding
+ from slixmpp.util.misc_ops import setdefaultencoding
setdefaultencoding('utf8')
@@ -144,7 +144,7 @@ class BaseXMPP(XMLStream):
#: behave as expected when sending stanzas.
self.sentpresence = False
- #: A reference to :mod:`sleekxmpp.stanza` to make accessing
+ #: A reference to :mod:`slixmpp.stanza` to make accessing
#: stanza classes easier.
self.stanza = stanza
@@ -316,11 +316,11 @@ class BaseXMPP(XMLStream):
:param id: An ideally unique ID value for this stanza thread.
Defaults to 0.
- :param ifrom: The from :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ifrom: The from :class:`~slixmpp.xmlstream.jid.JID`
to use for this stanza.
- :param ito: The destination :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ito: The destination :class:`~slixmpp.xmlstream.jid.JID`
for this stanza.
- :param itype: The :class:`~sleekxmpp.stanza.iq.Iq`'s type,
+ :param itype: The :class:`~slixmpp.stanza.iq.Iq`'s type,
one of: ``'get'``, ``'set'``, ``'result'``,
or ``'error'``.
:param iquery: Optional namespace for adding a query element.
@@ -334,14 +334,14 @@ class BaseXMPP(XMLStream):
return iq
def make_iq_get(self, queryxmlns=None, ito=None, ifrom=None, iq=None):
- """Create an :class:`~sleekxmpp.stanza.iq.Iq` stanza of type ``'get'``.
+ """Create an :class:`~slixmpp.stanza.iq.Iq` stanza of type ``'get'``.
Optionally, a query element may be added.
:param queryxmlns: The namespace of the query to use.
- :param ito: The destination :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ito: The destination :class:`~slixmpp.xmlstream.jid.JID`
for this stanza.
- :param ifrom: The ``'from'`` :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ifrom: The ``'from'`` :class:`~slixmpp.xmlstream.jid.JID`
to use for this stanza.
:param iq: Optionally use an existing stanza instead
of generating a new one.
@@ -358,13 +358,13 @@ class BaseXMPP(XMLStream):
def make_iq_result(self, id=None, ito=None, ifrom=None, iq=None):
"""
- Create an :class:`~sleekxmpp.stanza.iq.Iq` stanza of type
+ Create an :class:`~slixmpp.stanza.iq.Iq` stanza of type
``'result'`` with the given ID value.
:param id: An ideally unique ID value. May use :meth:`new_id()`.
- :param ito: The destination :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ito: The destination :class:`~slixmpp.xmlstream.jid.JID`
for this stanza.
- :param ifrom: The ``'from'`` :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ifrom: The ``'from'`` :class:`~slixmpp.xmlstream.jid.JID`
to use for this stanza.
:param iq: Optionally use an existing stanza instead
of generating a new one.
@@ -383,19 +383,19 @@ class BaseXMPP(XMLStream):
def make_iq_set(self, sub=None, ito=None, ifrom=None, iq=None):
"""
- Create an :class:`~sleekxmpp.stanza.iq.Iq` stanza of type ``'set'``.
+ Create an :class:`~slixmpp.stanza.iq.Iq` stanza of type ``'set'``.
Optionally, a substanza may be given to use as the
stanza's payload.
:param sub: Either an
- :class:`~sleekxmpp.xmlstream.stanzabase.ElementBase`
+ :class:`~slixmpp.xmlstream.stanzabase.ElementBase`
stanza object or an
:class:`~xml.etree.ElementTree.Element` XML object
- to use as the :class:`~sleekxmpp.stanza.iq.Iq`'s payload.
- :param ito: The destination :class:`~sleekxmpp.xmlstream.jid.JID`
+ to use as the :class:`~slixmpp.stanza.iq.Iq`'s payload.
+ :param ito: The destination :class:`~slixmpp.xmlstream.jid.JID`
for this stanza.
- :param ifrom: The ``'from'`` :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ifrom: The ``'from'`` :class:`~slixmpp.xmlstream.jid.JID`
to use for this stanza.
:param iq: Optionally use an existing stanza instead
of generating a new one.
@@ -415,7 +415,7 @@ class BaseXMPP(XMLStream):
condition='feature-not-implemented',
text=None, ito=None, ifrom=None, iq=None):
"""
- Create an :class:`~sleekxmpp.stanza.iq.Iq` stanza of type ``'error'``.
+ Create an :class:`~slixmpp.stanza.iq.Iq` stanza of type ``'error'``.
:param id: An ideally unique ID value. May use :meth:`new_id()`.
:param type: The type of the error, such as ``'cancel'`` or
@@ -423,9 +423,9 @@ class BaseXMPP(XMLStream):
:param condition: The error condition. Defaults to
``'feature-not-implemented'``.
:param text: A message describing the cause of the error.
- :param ito: The destination :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ito: The destination :class:`~slixmpp.xmlstream.jid.JID`
for this stanza.
- :param ifrom: The ``'from'`` :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ifrom: The ``'from'`` :class:`~slixmpp.xmlstream.jid.JID`
to use for this stanza.
:param iq: Optionally use an existing stanza instead
of generating a new one.
@@ -444,15 +444,15 @@ class BaseXMPP(XMLStream):
def make_iq_query(self, iq=None, xmlns='', ito=None, ifrom=None):
"""
- Create or modify an :class:`~sleekxmpp.stanza.iq.Iq` stanza
+ Create or modify an :class:`~slixmpp.stanza.iq.Iq` stanza
to use the given query namespace.
:param iq: Optionally use an existing stanza instead
of generating a new one.
:param xmlns: The query's namespace.
- :param ito: The destination :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ito: The destination :class:`~slixmpp.xmlstream.jid.JID`
for this stanza.
- :param ifrom: The ``'from'`` :class:`~sleekxmpp.xmlstream.jid.JID`
+ :param ifrom: The ``'from'`` :class:`~slixmpp.xmlstream.jid.JID`
to use for this stanza.
"""
if not iq:
@@ -478,7 +478,7 @@ class BaseXMPP(XMLStream):
mhtml=None, mfrom=None, mnick=None):
"""
Create and initialize a new
- :class:`~sleekxmpp.stanza.message.Message` stanza.
+ :class:`~slixmpp.stanza.message.Message` stanza.
:param mto: The recipient of the message.
:param mbody: The main contents of the message.
@@ -504,7 +504,7 @@ class BaseXMPP(XMLStream):
pto=None, ptype=None, pfrom=None, pnick=None):
"""
Create and initialize a new
- :class:`~sleekxmpp.stanza.presence.Presence` stanza.
+ :class:`~slixmpp.stanza.presence.Presence` stanza.
:param pshow: The presence's show value.
:param pstatus: The presence's status message.
@@ -528,7 +528,7 @@ class BaseXMPP(XMLStream):
mhtml=None, mfrom=None, mnick=None):
"""
Create, initialize, and send a new
- :class:`~sleekxmpp.stanza.message.Message` stanza.
+ :class:`~slixmpp.stanza.message.Message` stanza.
:param mto: The recipient of the message.
:param mbody: The main contents of the message.
@@ -548,7 +548,7 @@ class BaseXMPP(XMLStream):
pto=None, pfrom=None, ptype=None, pnick=None):
"""
Create, initialize, and send a new
- :class:`~sleekxmpp.stanza.presence.Presence` stanza.
+ :class:`~slixmpp.stanza.presence.Presence` stanza.
:param pshow: The presence's show value.
:param pstatus: The presence's status message.
@@ -565,7 +565,7 @@ class BaseXMPP(XMLStream):
ptype='subscribe', pnick=None):
"""
Create, initialize, and send a new
- :class:`~sleekxmpp.stanza.presence.Presence` stanza of
+ :class:`~slixmpp.stanza.presence.Presence` stanza of
type ``'subscribe'``.
:param pto: The recipient of a directed presence.
@@ -789,8 +789,8 @@ class BaseXMPP(XMLStream):
def exception(self, exception):
"""Process any uncaught exceptions, notably
- :class:`~sleekxmpp.exceptions.IqError` and
- :class:`~sleekxmpp.exceptions.IqTimeout` exceptions.
+ :class:`~slixmpp.exceptions.IqError` and
+ :class:`~slixmpp.exceptions.IqTimeout` exceptions.
:param exception: An unhandled :class:`Exception` object.
"""
diff --git a/sleekxmpp/clientxmpp.py b/slixmpp/clientxmpp.py
index f837c0f..55c82f8 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/slixmpp/clientxmpp.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
"""
- sleekxmpp.clientxmpp
+ slixmpp.clientxmpp
~~~~~~~~~~~~~~~~~~~~
This module provides XMPP functionality that
is specific to client connections.
- Part of SleekXMPP: The Sleek XMPP Library
+ Part of Slixmpp: The Slick XMPP Library
:copyright: (c) 2011 Nathanael C. Fritz
:license: MIT, see LICENSE for more details
@@ -16,12 +16,12 @@ from __future__ import absolute_import, unicode_literals
import logging
-from sleekxmpp.stanza import StreamFeatures
-from sleekxmpp.basexmpp import BaseXMPP
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import XMLStream
-from sleekxmpp.xmlstream.matcher import StanzaPath, MatchXPath
-from sleekxmpp.xmlstream.handler import Callback
+from slixmpp.stanza import StreamFeatures
+from slixmpp.basexmpp import BaseXMPP
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import XMLStream
+from slixmpp.xmlstream.matcher import StanzaPath, MatchXPath
+from slixmpp.xmlstream.handler import Callback
# Flag indicating if DNS SRV records are available for use.
try:
@@ -38,7 +38,7 @@ log = logging.getLogger(__name__)
class ClientXMPP(BaseXMPP):
"""
- SleekXMPP's client class. (Use only for good, not for evil.)
+ Slixmpp's client class. (Use only for good, not for evil.)
Typical use pattern:
@@ -56,7 +56,7 @@ class ClientXMPP(BaseXMPP):
:param plugin_config: A dictionary of plugin configurations.
:param plugin_whitelist: A list of approved plugins that
will be loaded when calling
- :meth:`~sleekxmpp.basexmpp.BaseXMPP.register_plugins()`.
+ :meth:`~slixmpp.basexmpp.BaseXMPP.register_plugins()`.
:param escape_quotes: **Deprecated.**
"""
@@ -196,7 +196,7 @@ class ClientXMPP(BaseXMPP):
:param timeout: The length of time (in seconds) to wait
for a response before continuing if blocking
is used. Defaults to
- :attr:`~sleekxmpp.xmlstream.xmlstream.XMLStream.response_timeout`.
+ :attr:`~slixmpp.xmlstream.xmlstream.XMLStream.response_timeout`.
:param callback: Optional reference to a stream handler function.
Will be executed when the roster is received.
Implies ``block=False``.
@@ -232,7 +232,7 @@ class ClientXMPP(BaseXMPP):
:param timeout: The length of time (in seconds) to wait for a response
before continuing if blocking is used.
Defaults to
- :attr:`~sleekxmpp.xmlstream.xmlstream.XMLStream.response_timeout`.
+ :attr:`~slixmpp.xmlstream.xmlstream.XMLStream.response_timeout`.
:param callback: Optional reference to a stream handler function. Will
be executed when the roster is received.
Implies ``block=False``.
@@ -319,7 +319,7 @@ class ClientXMPP(BaseXMPP):
def _handle_session_bind(self, jid):
"""Set the client roster to the JID set by the server.
- :param :class:`sleekxmpp.xmlstream.jid.JID` jid: The bound JID as
+ :param :class:`slixmpp.xmlstream.jid.JID` jid: The bound JID as
dictated by the server. The same as :attr:`boundjid`.
"""
self.client_roster = self.roster[jid]
diff --git a/sleekxmpp/componentxmpp.py b/slixmpp/componentxmpp.py
index bac455e..c640c3d 100644
--- a/sleekxmpp/componentxmpp.py
+++ b/slixmpp/componentxmpp.py
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
"""
- sleekxmpp.clientxmpp
+ slixmpp.clientxmpp
~~~~~~~~~~~~~~~~~~~~
This module provides XMPP functionality that
is specific to external server component connections.
- Part of SleekXMPP: The Sleek XMPP Library
+ Part of Slixmpp: The Slick XMPP Library
:copyright: (c) 2011 Nathanael C. Fritz
:license: MIT, see LICENSE for more details
@@ -18,11 +18,11 @@ import logging
import sys
import hashlib
-from sleekxmpp.basexmpp import BaseXMPP
-from sleekxmpp.xmlstream import XMLStream
-from sleekxmpp.xmlstream import ET
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.xmlstream.handler import Callback
+from slixmpp.basexmpp import BaseXMPP
+from slixmpp.xmlstream import XMLStream
+from slixmpp.xmlstream import ET
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.xmlstream.handler import Callback
log = logging.getLogger(__name__)
@@ -31,7 +31,7 @@ log = logging.getLogger(__name__)
class ComponentXMPP(BaseXMPP):
"""
- SleekXMPP's basic XMPP server component.
+ Slixmpp's basic XMPP server component.
Use only for good, not for evil.
@@ -42,7 +42,7 @@ class ComponentXMPP(BaseXMPP):
:param plugin_config: A dictionary of plugin configurations.
:param plugin_whitelist: A list of approved plugins that
will be loaded when calling
- :meth:`~sleekxmpp.basexmpp.BaseXMPP.register_plugins()`.
+ :meth:`~slixmpp.basexmpp.BaseXMPP.register_plugins()`.
:param use_jc_ns: Indicates if the ``'jabber:client'`` namespace
should be used instead of the standard
``'jabber:component:accept'`` namespace.
diff --git a/sleekxmpp/exceptions.py b/slixmpp/exceptions.py
index 8a2aa75..94bbf20 100644
--- a/sleekxmpp/exceptions.py
+++ b/slixmpp/exceptions.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
"""
- sleekxmpp.exceptions
+ slixmpp.exceptions
~~~~~~~~~~~~~~~~~~~~
- Part of SleekXMPP: The Sleek XMPP Library
+ Part of Slixmpp: The Slick XMPP Library
:copyright: (c) 2011 Nathanael C. Fritz
:license: MIT, see LICENSE for more details
@@ -17,11 +17,11 @@ class XMPPError(Exception):
to indicate that an error response stanza should be sent.
The exception method for stanza objects extending
- :class:`~sleekxmpp.stanza.rootstanza.RootStanza` will create an error
+ :class:`~slixmpp.stanza.rootstanza.RootStanza` will create an error
stanza and initialize any additional substanzas using the extension
information included in the exception.
- Meant for use in SleekXMPP plugins and applications using SleekXMPP.
+ Meant for use in Slixmpp plugins and applications using Slixmpp.
Extension information can be included to add additional XML elements
to the generated error stanza.
@@ -69,7 +69,7 @@ class IqTimeout(XMPPError):
condition='remote-server-timeout',
etype='cancel')
- #: The :class:`~sleekxmpp.stanza.iq.Iq` stanza whose response
+ #: The :class:`~slixmpp.stanza.iq.Iq` stanza whose response
#: did not arrive before the timeout expired.
self.iq = iq
@@ -87,5 +87,5 @@ class IqError(XMPPError):
text=iq['error']['text'],
etype=iq['error']['type'])
- #: The :class:`~sleekxmpp.stanza.iq.Iq` error result stanza.
+ #: The :class:`~slixmpp.stanza.iq.Iq` error result stanza.
self.iq = iq
diff --git a/sleekxmpp/features/__init__.py b/slixmpp/features/__init__.py
index 869de7e..5b728ee 100644
--- a/sleekxmpp/features/__init__.py
+++ b/slixmpp/features/__init__.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
diff --git a/slixmpp/features/feature_bind/__init__.py b/slixmpp/features/feature_bind/__init__.py
new file mode 100644
index 0000000..65f5b62
--- /dev/null
+++ b/slixmpp/features/feature_bind/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.features.feature_bind.bind import FeatureBind
+from slixmpp.features.feature_bind.stanza import Bind
+
+
+register_plugin(FeatureBind)
+
+
+# Retain some backwards compatibility
+feature_bind = FeatureBind
diff --git a/sleekxmpp/features/feature_bind/bind.py b/slixmpp/features/feature_bind/bind.py
index ee4c1e9..ac69ee7 100644
--- a/sleekxmpp/features/feature_bind/bind.py
+++ b/slixmpp/features/feature_bind/bind.py
@@ -1,18 +1,18 @@
"""
- 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 logging
-from sleekxmpp.jid import JID
-from sleekxmpp.stanza import Iq, StreamFeatures
-from sleekxmpp.features.feature_bind import stanza
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
+from slixmpp.jid import JID
+from slixmpp.stanza import Iq, StreamFeatures
+from slixmpp.features.feature_bind import stanza
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/features/feature_bind/stanza.py b/slixmpp/features/feature_bind/stanza.py
index 8ce7536..b9ecd97 100644
--- a/sleekxmpp/features/feature_bind/stanza.py
+++ b/slixmpp/features/feature_bind/stanza.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class Bind(ElementBase):
diff --git a/slixmpp/features/feature_mechanisms/__init__.py b/slixmpp/features/feature_mechanisms/__init__.py
new file mode 100644
index 0000000..7532eaa
--- /dev/null
+++ b/slixmpp/features/feature_mechanisms/__init__.py
@@ -0,0 +1,22 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.features.feature_mechanisms.mechanisms import FeatureMechanisms
+from slixmpp.features.feature_mechanisms.stanza import Mechanisms
+from slixmpp.features.feature_mechanisms.stanza import Auth
+from slixmpp.features.feature_mechanisms.stanza import Success
+from slixmpp.features.feature_mechanisms.stanza import Failure
+
+
+register_plugin(FeatureMechanisms)
+
+
+# Retain some backwards compatibility
+feature_mechanisms = FeatureMechanisms
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py
index 17ad5ed..663bfe5 100644
--- a/sleekxmpp/features/feature_mechanisms/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/mechanisms.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
@@ -9,14 +9,14 @@
import ssl
import logging
-from sleekxmpp.util import sasl
-from sleekxmpp.util.stringprep_profiles import StringPrepError
-from sleekxmpp.stanza import StreamFeatures
-from sleekxmpp.xmlstream import RestartStream, register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.features.feature_mechanisms import stanza
+from slixmpp.util import sasl
+from slixmpp.util.stringprep_profiles import StringPrepError
+from slixmpp.stanza import StreamFeatures
+from slixmpp.xmlstream import RestartStream, register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.features.feature_mechanisms import stanza
log = logging.getLogger(__name__)
diff --git a/slixmpp/features/feature_mechanisms/stanza/__init__.py b/slixmpp/features/feature_mechanisms/stanza/__init__.py
new file mode 100644
index 0000000..4d515bf
--- /dev/null
+++ b/slixmpp/features/feature_mechanisms/stanza/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+
+from slixmpp.features.feature_mechanisms.stanza.mechanisms import Mechanisms
+from slixmpp.features.feature_mechanisms.stanza.auth import Auth
+from slixmpp.features.feature_mechanisms.stanza.success import Success
+from slixmpp.features.feature_mechanisms.stanza.failure import Failure
+from slixmpp.features.feature_mechanisms.stanza.challenge import Challenge
+from slixmpp.features.feature_mechanisms.stanza.response import Response
+from slixmpp.features.feature_mechanisms.stanza.abort import Abort
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/abort.py b/slixmpp/features/feature_mechanisms/stanza/abort.py
index aaca348..fca29ae 100644
--- a/sleekxmpp/features/feature_mechanisms/stanza/abort.py
+++ b/slixmpp/features/feature_mechanisms/stanza/abort.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.xmlstream import StanzaBase
class Abort(StanzaBase):
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/auth.py b/slixmpp/features/feature_mechanisms/stanza/auth.py
index 6b6f85a..c32069e 100644
--- a/sleekxmpp/features/feature_mechanisms/stanza/auth.py
+++ b/slixmpp/features/feature_mechanisms/stanza/auth.py
@@ -1,15 +1,15 @@
"""
- 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 base64
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.util import bytes
+from slixmpp.xmlstream import StanzaBase
class Auth(StanzaBase):
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/challenge.py b/slixmpp/features/feature_mechanisms/stanza/challenge.py
index 2429028..21a061e 100644
--- a/sleekxmpp/features/feature_mechanisms/stanza/challenge.py
+++ b/slixmpp/features/feature_mechanisms/stanza/challenge.py
@@ -1,15 +1,15 @@
"""
- 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 base64
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.util import bytes
+from slixmpp.xmlstream import StanzaBase
class Challenge(StanzaBase):
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/failure.py b/slixmpp/features/feature_mechanisms/stanza/failure.py
index b9f3260..cc0ac87 100644
--- a/sleekxmpp/features/feature_mechanisms/stanza/failure.py
+++ b/slixmpp/features/feature_mechanisms/stanza/failure.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import StanzaBase, ET
+from slixmpp.xmlstream import StanzaBase, ET
class Failure(StanzaBase):
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py b/slixmpp/features/feature_mechanisms/stanza/mechanisms.py
index bbd5681..4437e15 100644
--- a/sleekxmpp/features/feature_mechanisms/stanza/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/stanza/mechanisms.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class Mechanisms(ElementBase):
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/response.py b/slixmpp/features/feature_mechanisms/stanza/response.py
index ca7624f..8da236b 100644
--- a/sleekxmpp/features/feature_mechanisms/stanza/response.py
+++ b/slixmpp/features/feature_mechanisms/stanza/response.py
@@ -1,15 +1,15 @@
"""
- 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 base64
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.util import bytes
+from slixmpp.xmlstream import StanzaBase
class Response(StanzaBase):
diff --git a/sleekxmpp/features/feature_mechanisms/stanza/success.py b/slixmpp/features/feature_mechanisms/stanza/success.py
index 7a4eab8..f7cde0f 100644
--- a/sleekxmpp/features/feature_mechanisms/stanza/success.py
+++ b/slixmpp/features/feature_mechanisms/stanza/success.py
@@ -1,15 +1,15 @@
"""
- 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 base64
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.util import bytes
+from slixmpp.xmlstream import StanzaBase
class Success(StanzaBase):
diff --git a/slixmpp/features/feature_preapproval/__init__.py b/slixmpp/features/feature_preapproval/__init__.py
new file mode 100644
index 0000000..f22be05
--- /dev/null
+++ b/slixmpp/features/feature_preapproval/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.features.feature_preapproval.preapproval import FeaturePreApproval
+from slixmpp.features.feature_preapproval.stanza import PreApproval
+
+
+register_plugin(FeaturePreApproval)
diff --git a/sleekxmpp/features/feature_preapproval/preapproval.py b/slixmpp/features/feature_preapproval/preapproval.py
index c7106ed..1d60d7e 100644
--- a/sleekxmpp/features/feature_preapproval/preapproval.py
+++ b/slixmpp/features/feature_preapproval/preapproval.py
@@ -1,17 +1,17 @@
"""
- 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 logging
-from sleekxmpp.stanza import StreamFeatures
-from sleekxmpp.features.feature_preapproval import stanza
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import BasePlugin
+from slixmpp.stanza import StreamFeatures
+from slixmpp.features.feature_preapproval import stanza
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.base import BasePlugin
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/features/feature_preapproval/stanza.py b/slixmpp/features/feature_preapproval/stanza.py
index 4a59bd1..03d721e 100644
--- a/sleekxmpp/features/feature_preapproval/stanza.py
+++ b/slixmpp/features/feature_preapproval/stanza.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class PreApproval(ElementBase):
diff --git a/slixmpp/features/feature_rosterver/__init__.py b/slixmpp/features/feature_rosterver/__init__.py
new file mode 100644
index 0000000..d338b58
--- /dev/null
+++ b/slixmpp/features/feature_rosterver/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.features.feature_rosterver.rosterver import FeatureRosterVer
+from slixmpp.features.feature_rosterver.stanza import RosterVer
+
+
+register_plugin(FeatureRosterVer)
+
+
+# Retain some backwards compatibility
+feature_rosterver = FeatureRosterVer
diff --git a/sleekxmpp/features/feature_rosterver/rosterver.py b/slixmpp/features/feature_rosterver/rosterver.py
index 2991f58..2c2c8c8 100644
--- a/sleekxmpp/features/feature_rosterver/rosterver.py
+++ b/slixmpp/features/feature_rosterver/rosterver.py
@@ -1,17 +1,17 @@
"""
- 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 logging
-from sleekxmpp.stanza import StreamFeatures
-from sleekxmpp.features.feature_rosterver import stanza
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import BasePlugin
+from slixmpp.stanza import StreamFeatures
+from slixmpp.features.feature_rosterver import stanza
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.base import BasePlugin
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/features/feature_rosterver/stanza.py b/slixmpp/features/feature_rosterver/stanza.py
index 025872f..c9a4a2d 100644
--- a/sleekxmpp/features/feature_rosterver/stanza.py
+++ b/slixmpp/features/feature_rosterver/stanza.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class RosterVer(ElementBase):
diff --git a/slixmpp/features/feature_session/__init__.py b/slixmpp/features/feature_session/__init__.py
new file mode 100644
index 0000000..0ac950c
--- /dev/null
+++ b/slixmpp/features/feature_session/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.features.feature_session.session import FeatureSession
+from slixmpp.features.feature_session.stanza import Session
+
+
+register_plugin(FeatureSession)
+
+
+# Retain some backwards compatibility
+feature_session = FeatureSession
diff --git a/sleekxmpp/features/feature_session/session.py b/slixmpp/features/feature_session/session.py
index ceadd5f..c2694a9 100644
--- a/sleekxmpp/features/feature_session/session.py
+++ b/slixmpp/features/feature_session/session.py
@@ -1,18 +1,18 @@
"""
- 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 logging
-from sleekxmpp.stanza import Iq, StreamFeatures
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
+from slixmpp.stanza import Iq, StreamFeatures
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
-from sleekxmpp.features.feature_session import stanza
+from slixmpp.features.feature_session import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/features/feature_session/stanza.py b/slixmpp/features/feature_session/stanza.py
index 94e949e..f68483d 100644
--- a/sleekxmpp/features/feature_session/stanza.py
+++ b/slixmpp/features/feature_session/stanza.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class Session(ElementBase):
diff --git a/slixmpp/features/feature_starttls/__init__.py b/slixmpp/features/feature_starttls/__init__.py
new file mode 100644
index 0000000..81a8865
--- /dev/null
+++ b/slixmpp/features/feature_starttls/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.features.feature_starttls.starttls import FeatureSTARTTLS
+from slixmpp.features.feature_starttls.stanza import *
+
+
+register_plugin(FeatureSTARTTLS)
+
+
+# Retain some backwards compatibility
+feature_starttls = FeatureSTARTTLS
diff --git a/sleekxmpp/features/feature_starttls/stanza.py b/slixmpp/features/feature_starttls/stanza.py
index b968e13..df50897 100644
--- a/sleekxmpp/features/feature_starttls/stanza.py
+++ b/slixmpp/features/feature_starttls/stanza.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import StanzaBase, ElementBase
+from slixmpp.xmlstream import StanzaBase, ElementBase
class STARTTLS(ElementBase):
diff --git a/sleekxmpp/features/feature_starttls/starttls.py b/slixmpp/features/feature_starttls/starttls.py
index eb5eee1..4b9dd60 100644
--- a/sleekxmpp/features/feature_starttls/starttls.py
+++ b/slixmpp/features/feature_starttls/starttls.py
@@ -1,19 +1,19 @@
"""
- 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 logging
-from sleekxmpp.stanza import StreamFeatures
-from sleekxmpp.xmlstream import RestartStream, register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.features.feature_starttls import stanza
+from slixmpp.stanza import StreamFeatures
+from slixmpp.xmlstream import RestartStream, register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.features.feature_starttls import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/jid.py b/slixmpp/jid.py
index ac5ba30..b7ebfbe 100644
--- a/sleekxmpp/jid.py
+++ b/slixmpp/jid.py
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
"""
- sleekxmpp.jid
+ slixmpp.jid
~~~~~~~~~~~~~~~~~~~~~~~
This module allows for working with Jabber IDs (JIDs).
- Part of SleekXMPP: The Sleek XMPP Library
+ Part of Slixmpp: The Slick XMPP Library
:copyright: (c) 2011 Nathanael C. Fritz
:license: MIT, see LICENSE for more details
@@ -21,8 +21,8 @@ import encodings.idna
from copy import deepcopy
-from sleekxmpp.util import stringprep_profiles
-from sleekxmpp.thirdparty import OrderedDict
+from slixmpp.util import stringprep_profiles
+from slixmpp.thirdparty import OrderedDict
#: These characters are not allowed to appear in a JID.
ILLEGAL_CHARS = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r' + \
diff --git a/sleekxmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py
index 951f31e..cf24cae 100644
--- a/sleekxmpp/plugins/__init__.py
+++ b/slixmpp/plugins/__init__.py
@@ -1,13 +1,13 @@
"""
- 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.
"""
-from sleekxmpp.plugins.base import PluginManager, PluginNotFound, BasePlugin
-from sleekxmpp.plugins.base import register_plugin, load_plugin
+from slixmpp.plugins.base import PluginManager, PluginNotFound, BasePlugin
+from slixmpp.plugins.base import register_plugin, load_plugin
__all__ = [
diff --git a/sleekxmpp/plugins/base.py b/slixmpp/plugins/base.py
index 6767590..9694a41 100644
--- a/sleekxmpp/plugins/base.py
+++ b/slixmpp/plugins/base.py
@@ -1,13 +1,13 @@
# -*- encoding: utf-8 -*-
"""
- sleekxmpp.plugins.base
+ slixmpp.plugins.base
~~~~~~~~~~~~~~~~~~~~~~
This module provides XMPP functionality that
is specific to client connections.
- Part of SleekXMPP: The Sleek XMPP Library
+ Part of Slixmpp: The Slick XMPP Library
:copyright: (c) 2012 Nathanael C. Fritz
:license: MIT, see LICENSE for more details
@@ -82,11 +82,11 @@ def load_plugin(name, module=None):
try:
if not module:
try:
- module = 'sleekxmpp.plugins.%s' % name
+ module = 'slixmpp.plugins.%s' % name
__import__(module)
mod = sys.modules[module]
except ImportError:
- module = 'sleekxmpp.features.%s' % name
+ module = 'slixmpp.features.%s' % name
__import__(module)
mod = sys.modules[module]
elif isinstance(module, (str, unicode)):
diff --git a/sleekxmpp/plugins/gmail_notify.py b/slixmpp/plugins/gmail_notify.py
index fc97a2a..d40e932 100644
--- a/sleekxmpp/plugins/gmail_notify.py
+++ b/slixmpp/plugins/gmail_notify.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
diff --git a/sleekxmpp/plugins/google/__init__.py b/slixmpp/plugins/google/__init__.py
index bd7ca12..443bce3 100644
--- a/sleekxmpp/plugins/google/__init__.py
+++ b/slixmpp/plugins/google/__init__.py
@@ -1,17 +1,17 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins.base import register_plugin, BasePlugin
+from slixmpp.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
+from slixmpp.plugins.google.gmail import Gmail
+from slixmpp.plugins.google.auth import GoogleAuth
+from slixmpp.plugins.google.settings import GoogleSettings
+from slixmpp.plugins.google.nosave import GoogleNoSave
class Google(BasePlugin):
diff --git a/slixmpp/plugins/google/auth/__init__.py b/slixmpp/plugins/google/auth/__init__.py
new file mode 100644
index 0000000..ceb94e4
--- /dev/null
+++ b/slixmpp/plugins/google/auth/__init__.py
@@ -0,0 +1,10 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.auth import stanza
+from slixmpp.plugins.google.auth.auth import GoogleAuth
diff --git a/sleekxmpp/plugins/google/auth/auth.py b/slixmpp/plugins/google/auth/auth.py
index 042bd40..e01d81a 100644
--- a/sleekxmpp/plugins/google/auth/auth.py
+++ b/slixmpp/plugins/google/auth/auth.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
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
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.google.auth import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/google/auth/stanza.py b/slixmpp/plugins/google/auth/stanza.py
index 49c5cba..524a41e 100644
--- a/sleekxmpp/plugins/google/auth/stanza.py
+++ b/slixmpp/plugins/google/auth/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class GoogleAuth(ElementBase):
diff --git a/slixmpp/plugins/google/gmail/__init__.py b/slixmpp/plugins/google/gmail/__init__.py
new file mode 100644
index 0000000..beb960d
--- /dev/null
+++ b/slixmpp/plugins/google/gmail/__init__.py
@@ -0,0 +1,10 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.gmail import stanza
+from slixmpp.plugins.google.gmail.notifications import Gmail
diff --git a/sleekxmpp/plugins/google/gmail/notifications.py b/slixmpp/plugins/google/gmail/notifications.py
index 509a95f..aa9b6a3 100644
--- a/sleekxmpp/plugins/google/gmail/notifications.py
+++ b/slixmpp/plugins/google/gmail/notifications.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
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
+from slixmpp.stanza import Iq
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.google.gmail import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/google/gmail/stanza.py b/slixmpp/plugins/google/gmail/stanza.py
index e7e308e..73826f5 100644
--- a/sleekxmpp/plugins/google/gmail/stanza.py
+++ b/slixmpp/plugins/google/gmail/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class GmailQuery(ElementBase):
diff --git a/slixmpp/plugins/google/nosave/__init__.py b/slixmpp/plugins/google/nosave/__init__.py
new file mode 100644
index 0000000..ee20d6e
--- /dev/null
+++ b/slixmpp/plugins/google/nosave/__init__.py
@@ -0,0 +1,10 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.nosave import stanza
+from slixmpp.plugins.google.nosave.nosave import GoogleNoSave
diff --git a/sleekxmpp/plugins/google/nosave/nosave.py b/slixmpp/plugins/google/nosave/nosave.py
index d6bef61..735830a 100644
--- a/sleekxmpp/plugins/google/nosave/nosave.py
+++ b/slixmpp/plugins/google/nosave/nosave.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
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
+from slixmpp.stanza import Iq, Message
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.google.nosave import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/google/nosave/stanza.py b/slixmpp/plugins/google/nosave/stanza.py
index d870132..c9e1fb9 100644
--- a/sleekxmpp/plugins/google/nosave/stanza.py
+++ b/slixmpp/plugins/google/nosave/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.jid import JID
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class NoSave(ElementBase):
diff --git a/slixmpp/plugins/google/settings/__init__.py b/slixmpp/plugins/google/settings/__init__.py
new file mode 100644
index 0000000..fa49e87
--- /dev/null
+++ b/slixmpp/plugins/google/settings/__init__.py
@@ -0,0 +1,10 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.google.settings import stanza
+from slixmpp.plugins.google.settings.settings import GoogleSettings
diff --git a/sleekxmpp/plugins/google/settings/settings.py b/slixmpp/plugins/google/settings/settings.py
index 7122ff5..3dfb338 100644
--- a/sleekxmpp/plugins/google/settings/settings.py
+++ b/slixmpp/plugins/google/settings/settings.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
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
+from slixmpp.stanza import Iq
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.google.settings import stanza
class GoogleSettings(BasePlugin):
diff --git a/sleekxmpp/plugins/google/settings/stanza.py b/slixmpp/plugins/google/settings/stanza.py
index d816177..556a653 100644
--- a/sleekxmpp/plugins/google/settings/stanza.py
+++ b/slixmpp/plugins/google/settings/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ET, ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ET, ElementBase, register_stanza_plugin
class UserSettings(ElementBase):
diff --git a/slixmpp/plugins/xep_0004/__init__.py b/slixmpp/plugins/xep_0004/__init__.py
new file mode 100644
index 0000000..3eb2b7a
--- /dev/null
+++ b/slixmpp/plugins/xep_0004/__init__.py
@@ -0,0 +1,22 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0004.stanza import Form
+from slixmpp.plugins.xep_0004.stanza import FormField, FieldOption
+from slixmpp.plugins.xep_0004.dataforms import XEP_0004
+
+
+register_plugin(XEP_0004)
+
+
+# Retain some backwards compatibility
+xep_0004 = XEP_0004
+xep_0004.makeForm = xep_0004.make_form
+xep_0004.buildForm = xep_0004.build_form
diff --git a/sleekxmpp/plugins/xep_0004/dataforms.py b/slixmpp/plugins/xep_0004/dataforms.py
index dde6e6a..90a8777 100644
--- a/sleekxmpp/plugins/xep_0004/dataforms.py
+++ b/slixmpp/plugins/xep_0004/dataforms.py
@@ -1,18 +1,18 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp import Message
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0004 import stanza
-from sleekxmpp.plugins.xep_0004.stanza import Form, FormField, FieldOption
+from slixmpp import Message
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0004 import stanza
+from slixmpp.plugins.xep_0004.stanza import Form, FormField, FieldOption
class XEP_0004(BasePlugin):
diff --git a/slixmpp/plugins/xep_0004/stanza/__init__.py b/slixmpp/plugins/xep_0004/stanza/__init__.py
new file mode 100644
index 0000000..9daaab7
--- /dev/null
+++ b/slixmpp/plugins/xep_0004/stanza/__init__.py
@@ -0,0 +1,10 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.xep_0004.stanza.field import FormField, FieldOption
+from slixmpp.plugins.xep_0004.stanza.form import Form
diff --git a/sleekxmpp/plugins/xep_0004/stanza/field.py b/slixmpp/plugins/xep_0004/stanza/field.py
index 51f8599..ceddcd0 100644
--- a/sleekxmpp/plugins/xep_0004/stanza/field.py
+++ b/slixmpp/plugins/xep_0004/stanza/field.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class FormField(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0004/stanza/form.py b/slixmpp/plugins/xep_0004/stanza/form.py
index bbd8540..1f900ee 100644
--- a/sleekxmpp/plugins/xep_0004/stanza/form.py
+++ b/slixmpp/plugins/xep_0004/stanza/form.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,10 +9,10 @@
import copy
import logging
-from sleekxmpp.thirdparty import OrderedDict
+from slixmpp.thirdparty import OrderedDict
-from sleekxmpp.xmlstream import ElementBase, ET
-from sleekxmpp.plugins.xep_0004.stanza import FormField
+from slixmpp.xmlstream import ElementBase, ET
+from slixmpp.plugins.xep_0004.stanza import FormField
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0009/__init__.py b/slixmpp/plugins/xep_0009/__init__.py
new file mode 100644
index 0000000..a06306b
--- /dev/null
+++ b/slixmpp/plugins/xep_0009/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0009 import stanza
+from slixmpp.plugins.xep_0009.rpc import XEP_0009
+from slixmpp.plugins.xep_0009.stanza import RPCQuery, MethodCall, MethodResponse
+
+
+register_plugin(XEP_0009)
+
+
+# Retain some backwards compatibility
+xep_0009 = XEP_0009
diff --git a/sleekxmpp/plugins/xep_0009/binding.py b/slixmpp/plugins/xep_0009/binding.py
index a55993a..5416fc4 100644
--- a/sleekxmpp/plugins/xep_0009/binding.py
+++ b/slixmpp/plugins/xep_0009/binding.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ET
+from slixmpp.xmlstream import ET
import base64
import logging
import time
diff --git a/sleekxmpp/plugins/xep_0009/remote.py b/slixmpp/plugins/xep_0009/remote.py
index 8c08e8f..99df929 100644
--- a/sleekxmpp/plugins/xep_0009/remote.py
+++ b/slixmpp/plugins/xep_0009/remote.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -11,7 +11,7 @@ from threading import RLock
import abc
import inspect
import logging
-import sleekxmpp
+import slixmpp
import sys
import threading
import traceback
@@ -436,7 +436,7 @@ class RemoteSession(object):
Initializes a new RPC session.
Arguments:
- client -- The SleekXMPP client associated with this session.
+ client -- The Slixmpp client associated with this session.
session_close_callback -- A callback called when the
session is closed.
'''
@@ -731,7 +731,7 @@ class Remote(object):
callback -- An optional callback which can be used to track
the starting state of the session.
'''
- client = sleekxmpp.ClientXMPP(jid, password)
+ client = slixmpp.ClientXMPP(jid, password)
#? Register plug-ins.
client.registerPlugin('xep_0004') # Data Forms
client.registerPlugin('xep_0009') # Jabber-RPC
diff --git a/sleekxmpp/plugins/xep_0009/rpc.py b/slixmpp/plugins/xep_0009/rpc.py
index 3378c65..ff17c41 100644
--- a/sleekxmpp/plugins/xep_0009/rpc.py
+++ b/slixmpp/plugins/xep_0009/rpc.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq
-from sleekxmpp.xmlstream import ET, register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0009 import stanza
-from sleekxmpp.plugins.xep_0009.stanza.RPC import RPCQuery, MethodCall, MethodResponse
+from slixmpp import Iq
+from slixmpp.xmlstream import ET, register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0009 import stanza
+from slixmpp.plugins.xep_0009.stanza.RPC import RPCQuery, MethodCall, MethodResponse
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0009/stanza/RPC.py b/slixmpp/plugins/xep_0009/stanza/RPC.py
index 3d1c77a..3abab8f 100644
--- a/sleekxmpp/plugins/xep_0009/stanza/RPC.py
+++ b/slixmpp/plugins/xep_0009/stanza/RPC.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream.stanzabase import ElementBase
+from slixmpp.xmlstream.stanzabase import ElementBase
from xml.etree import cElementTree as ET
diff --git a/slixmpp/plugins/xep_0009/stanza/__init__.py b/slixmpp/plugins/xep_0009/stanza/__init__.py
new file mode 100644
index 0000000..79a8a3d
--- /dev/null
+++ b/slixmpp/plugins/xep_0009/stanza/__init__.py
@@ -0,0 +1,9 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.xep_0009.stanza.RPC import RPCQuery, MethodCall, MethodResponse
diff --git a/slixmpp/plugins/xep_0012/__init__.py b/slixmpp/plugins/xep_0012/__init__.py
new file mode 100644
index 0000000..3dd3998
--- /dev/null
+++ b/slixmpp/plugins/xep_0012/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0012.stanza import LastActivity
+from slixmpp.plugins.xep_0012.last_activity import XEP_0012
+
+
+register_plugin(XEP_0012)
+
+
+# Retain some backwards compatibility
+xep_0004 = XEP_0012
diff --git a/sleekxmpp/plugins/xep_0012/last_activity.py b/slixmpp/plugins/xep_0012/last_activity.py
index 8790b47..2fef9ca 100644
--- a/sleekxmpp/plugins/xep_0012/last_activity.py
+++ b/slixmpp/plugins/xep_0012/last_activity.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,13 +9,13 @@
import logging
from datetime import datetime, timedelta
-from sleekxmpp.plugins import BasePlugin, register_plugin
-from sleekxmpp import Iq
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import JID, register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.xep_0012 import stanza, LastActivity
+from slixmpp.plugins import BasePlugin, register_plugin
+from slixmpp import Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import JID, register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.xep_0012 import stanza, LastActivity
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0012/stanza.py b/slixmpp/plugins/xep_0012/stanza.py
index 079865b..bd539a2 100644
--- a/sleekxmpp/plugins/xep_0012/stanza.py
+++ b/slixmpp/plugins/xep_0012/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class LastActivity(ElementBase):
diff --git a/slixmpp/plugins/xep_0013/__init__.py b/slixmpp/plugins/xep_0013/__init__.py
new file mode 100644
index 0000000..c02a6c5
--- /dev/null
+++ b/slixmpp/plugins/xep_0013/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permissio
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0013.stanza import Offline
+from slixmpp.plugins.xep_0013.offline import XEP_0013
+
+
+register_plugin(XEP_0013)
diff --git a/sleekxmpp/plugins/xep_0013/offline.py b/slixmpp/plugins/xep_0013/offline.py
index a0d992a..d6b500d 100644
--- a/sleekxmpp/plugins/xep_0013/offline.py
+++ b/slixmpp/plugins/xep_0013/offline.py
@@ -1,21 +1,21 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
import logging
-import sleekxmpp
-from sleekxmpp.stanza import Message, Iq
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream.handler import Collector
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0013 import stanza
+import slixmpp
+from slixmpp.stanza import Message, Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream.handler import Collector
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0013 import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0013/stanza.py b/slixmpp/plugins/xep_0013/stanza.py
index c9c6978..cf9c385 100644
--- a/sleekxmpp/plugins/xep_0013/stanza.py
+++ b/slixmpp/plugins/xep_0013/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.jid import JID
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class Offline(ElementBase):
diff --git a/slixmpp/plugins/xep_0016/__init__.py b/slixmpp/plugins/xep_0016/__init__.py
new file mode 100644
index 0000000..aa95c78
--- /dev/null
+++ b/slixmpp/plugins/xep_0016/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0016 import stanza
+from slixmpp.plugins.xep_0016.stanza import Privacy
+from slixmpp.plugins.xep_0016.privacy import XEP_0016
+
+
+register_plugin(XEP_0016)
diff --git a/sleekxmpp/plugins/xep_0016/privacy.py b/slixmpp/plugins/xep_0016/privacy.py
index 79fd68f..25d5504 100644
--- a/sleekxmpp/plugins/xep_0016/privacy.py
+++ b/slixmpp/plugins/xep_0016/privacy.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
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
+from slixmpp import Iq
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0016 import stanza
+from slixmpp.plugins.xep_0016.stanza import Privacy, Item
class XEP_0016(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0016/stanza.py b/slixmpp/plugins/xep_0016/stanza.py
index 3f9977f..58c9fdb 100644
--- a/sleekxmpp/plugins/xep_0016/stanza.py
+++ b/slixmpp/plugins/xep_0016/stanza.py
@@ -1,4 +1,4 @@
-from sleekxmpp.xmlstream import ET, ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ET, ElementBase, register_stanza_plugin
class Privacy(ElementBase):
diff --git a/slixmpp/plugins/xep_0020/__init__.py b/slixmpp/plugins/xep_0020/__init__.py
new file mode 100644
index 0000000..53d96fe
--- /dev/null
+++ b/slixmpp/plugins/xep_0020/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0020 import stanza
+from slixmpp.plugins.xep_0020.stanza import FeatureNegotiation
+from slixmpp.plugins.xep_0020.feature_negotiation import XEP_0020
+
+
+register_plugin(XEP_0020)
diff --git a/sleekxmpp/plugins/xep_0020/feature_negotiation.py b/slixmpp/plugins/xep_0020/feature_negotiation.py
index 7cb82cd..2f4e8c1 100644
--- a/sleekxmpp/plugins/xep_0020/feature_negotiation.py
+++ b/slixmpp/plugins/xep_0020/feature_negotiation.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq, Message
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins.xep_0020 import stanza, FeatureNegotiation
-from sleekxmpp.plugins.xep_0004 import Form
+from slixmpp import Iq, Message
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins.xep_0020 import stanza, FeatureNegotiation
+from slixmpp.plugins.xep_0004 import Form
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0020/stanza.py b/slixmpp/plugins/xep_0020/stanza.py
index 13e4056..d9cea8f 100644
--- a/sleekxmpp/plugins/xep_0020/stanza.py
+++ b/slixmpp/plugins/xep_0020/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class FeatureNegotiation(ElementBase):
diff --git a/slixmpp/plugins/xep_0027/__init__.py b/slixmpp/plugins/xep_0027/__init__.py
new file mode 100644
index 0000000..1f510cb
--- /dev/null
+++ b/slixmpp/plugins/xep_0027/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0027.stanza import Signed, Encrypted
+from slixmpp.plugins.xep_0027.gpg import XEP_0027
+
+
+register_plugin(XEP_0027)
diff --git a/sleekxmpp/plugins/xep_0027/gpg.py b/slixmpp/plugins/xep_0027/gpg.py
index 52c1c46..e997841 100644
--- a/sleekxmpp/plugins/xep_0027/gpg.py
+++ b/slixmpp/plugins/xep_0027/gpg.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.thirdparty import GPG
+from slixmpp.thirdparty import GPG
-from sleekxmpp.stanza import Presence, Message
-from sleekxmpp.plugins.base import BasePlugin, register_plugin
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.xep_0027 import stanza, Signed, Encrypted
+from slixmpp.stanza import Presence, Message
+from slixmpp.plugins.base import BasePlugin, register_plugin
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.xep_0027 import stanza, Signed, Encrypted
def _extract_data(data, kind):
diff --git a/sleekxmpp/plugins/xep_0027/stanza.py b/slixmpp/plugins/xep_0027/stanza.py
index 08f2032..fd41cac 100644
--- a/sleekxmpp/plugins/xep_0027/stanza.py
+++ b/slixmpp/plugins/xep_0027/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class Signed(ElementBase):
diff --git a/slixmpp/plugins/xep_0030/__init__.py b/slixmpp/plugins/xep_0030/__init__.py
new file mode 100644
index 0000000..7f8e52b
--- /dev/null
+++ b/slixmpp/plugins/xep_0030/__init__.py
@@ -0,0 +1,23 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0030 import stanza
+from slixmpp.plugins.xep_0030.stanza import DiscoInfo, DiscoItems
+from slixmpp.plugins.xep_0030.static import StaticDisco
+from slixmpp.plugins.xep_0030.disco import XEP_0030
+
+
+register_plugin(XEP_0030)
+
+# Retain some backwards compatibility
+xep_0030 = XEP_0030
+XEP_0030.getInfo = XEP_0030.get_info
+XEP_0030.getItems = XEP_0030.get_items
+XEP_0030.make_static = XEP_0030.restore_defaults
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/slixmpp/plugins/xep_0030/disco.py
index 8a39792..1283795 100644
--- a/sleekxmpp/plugins/xep_0030/disco.py
+++ b/slixmpp/plugins/xep_0030/disco.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins.xep_0030 import stanza, DiscoInfo, DiscoItems
-from sleekxmpp.plugins.xep_0030 import StaticDisco
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins.xep_0030 import stanza, DiscoInfo, DiscoItems
+from slixmpp.plugins.xep_0030 import StaticDisco
log = logging.getLogger(__name__)
@@ -65,7 +65,7 @@ class XEP_0030(BasePlugin):
static node handlers.
default_handlers -- A dictionary mapping operations to the default
global handler (by default, the static handlers).
- xmpp -- The main SleekXMPP object.
+ xmpp -- The main Slixmpp object.
Methods:
set_node_handler -- Assign a handler to a JID/node combination.
@@ -233,7 +233,7 @@ class XEP_0030(BasePlugin):
node -- The particular node to query.
feature -- The name of the feature to check.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the info.
@@ -268,7 +268,7 @@ class XEP_0030(BasePlugin):
itype -- The type of the identity to check.
lang -- The language of the identity to check.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the info.
@@ -305,7 +305,7 @@ class XEP_0030(BasePlugin):
jid -- Request info from this JID.
node -- The particular node to query.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the info.
@@ -324,7 +324,7 @@ class XEP_0030(BasePlugin):
callback -- Optional callback to execute when a reply is
received instead of blocking and waiting for
the reply.
- timeout_callback -- Optional callback to execute when no result
+ timeout_callback -- Optional callback to execute when no result
has been received in timeout seconds.
"""
if local is None:
@@ -394,7 +394,7 @@ class XEP_0030(BasePlugin):
jid -- Request info from this JID.
node -- The particular node to query.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the items.
@@ -408,7 +408,7 @@ class XEP_0030(BasePlugin):
iterator -- If True, return a result set iterator using
the XEP-0059 plugin, if the plugin is loaded.
Otherwise the parameter is ignored.
- timeout_callback -- Optional callback to execute when no result
+ timeout_callback -- Optional callback to execute when no result
has been received in timeout seconds.
"""
if local or local is None and jid is None:
@@ -691,7 +691,7 @@ class XEP_0030(BasePlugin):
"""
Disco#info results for a JID are required to include at least
one identity and feature. As a default, if no other identity is
- provided, SleekXMPP will use either the generic component or the
+ provided, Slixmpp will use either the generic component or the
bot client identity. A the standard disco#info feature will also be
added if no features are provided.
diff --git a/slixmpp/plugins/xep_0030/stanza/__init__.py b/slixmpp/plugins/xep_0030/stanza/__init__.py
new file mode 100644
index 0000000..bdac9bf
--- /dev/null
+++ b/slixmpp/plugins/xep_0030/stanza/__init__.py
@@ -0,0 +1,10 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.xep_0030.stanza.info import DiscoInfo
+from slixmpp.plugins.xep_0030.stanza.items import DiscoItems
diff --git a/sleekxmpp/plugins/xep_0030/stanza/info.py b/slixmpp/plugins/xep_0030/stanza/info.py
index 25d1d07..e749cc2 100644
--- a/sleekxmpp/plugins/xep_0030/stanza/info.py
+++ b/slixmpp/plugins/xep_0030/stanza/info.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class DiscoInfo(ElementBase):
@@ -40,7 +40,7 @@ class DiscoInfo(ElementBase):
<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" />
<feature var="http://jabber.org/protocol/disco#info" />
<feature var="jabber:x:data" />
<feature var="urn:xmpp:ping" />
diff --git a/sleekxmpp/plugins/xep_0030/stanza/items.py b/slixmpp/plugins/xep_0030/stanza/items.py
index 1045861..0e23849 100644
--- a/sleekxmpp/plugins/xep_0030/stanza/items.py
+++ b/slixmpp/plugins/xep_0030/stanza/items.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class DiscoItems(ElementBase):
@@ -23,8 +23,8 @@ class DiscoItems(ElementBase):
node="xmppdev"
name="XMPP Dev" />
<item jid="chat.example.com"
- node="sleekdev"
- name="SleekXMPP Dev" />
+ node="slixdev"
+ name="Slixmpp Dev" />
</query>
</iq>
diff --git a/sleekxmpp/plugins/xep_0030/static.py b/slixmpp/plugins/xep_0030/static.py
index dd5317d..d9a7c80 100644
--- a/sleekxmpp/plugins/xep_0030/static.py
+++ b/slixmpp/plugins/xep_0030/static.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,10 +9,10 @@
import logging
import threading
-from sleekxmpp import Iq
-from sleekxmpp.exceptions import XMPPError, IqError, IqTimeout
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.plugins.xep_0030 import DiscoInfo, DiscoItems
+from slixmpp import Iq
+from slixmpp.exceptions import XMPPError, IqError, IqTimeout
+from slixmpp.xmlstream import JID
+from slixmpp.plugins.xep_0030 import DiscoInfo, DiscoItems
log = logging.getLogger(__name__)
@@ -32,7 +32,7 @@ class StaticDisco(object):
Attributes:
nodes -- A dictionary mapping (JID, node) tuples to a dict
containing a disco#info and a disco#items stanza.
- xmpp -- The main SleekXMPP object.
+ xmpp -- The main Slixmpp object.
"""
def __init__(self, xmpp, disco):
@@ -43,7 +43,7 @@ class StaticDisco(object):
information in memory without any additional processing.
Arguments:
- xmpp -- The main SleekXMPP object.
+ xmpp -- The main Slixmpp object.
"""
self.nodes = {}
self.xmpp = xmpp
@@ -123,7 +123,7 @@ class StaticDisco(object):
The data parameter may provide:
feature -- The feature to check for support.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the info.
@@ -163,7 +163,7 @@ class StaticDisco(object):
itype -- The type of the identity to check.
lang -- The language of the identity to check.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the info.
diff --git a/slixmpp/plugins/xep_0033/__init__.py b/slixmpp/plugins/xep_0033/__init__.py
new file mode 100644
index 0000000..e6953ce
--- /dev/null
+++ b/slixmpp/plugins/xep_0033/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0033 import stanza
+from slixmpp.plugins.xep_0033.stanza import Addresses, Address
+from slixmpp.plugins.xep_0033.addresses import XEP_0033
+
+
+register_plugin(XEP_0033)
+
+# Retain some backwards compatibility
+xep_0033 = XEP_0033
+Addresses.addAddress = Addresses.add_address
diff --git a/sleekxmpp/plugins/xep_0033/addresses.py b/slixmpp/plugins/xep_0033/addresses.py
index 13cb726..7b3c2d1 100644
--- a/sleekxmpp/plugins/xep_0033/addresses.py
+++ b/slixmpp/plugins/xep_0033/addresses.py
@@ -1,17 +1,17 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Message, Presence
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0033 import stanza, Addresses
+from slixmpp import Message, Presence
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0033 import stanza, Addresses
class XEP_0033(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0033/stanza.py b/slixmpp/plugins/xep_0033/stanza.py
index 1ff9fb2..3f89f37 100644
--- a/sleekxmpp/plugins/xep_0033/stanza.py
+++ b/slixmpp/plugins/xep_0033/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import JID, ElementBase, ET, register_stanza_plugin
+from slixmpp.xmlstream import JID, ElementBase, ET, register_stanza_plugin
class Addresses(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0045.py b/slixmpp/plugins/xep_0045.py
index ca5ed1e..5950ab1 100644
--- a/sleekxmpp/plugins/xep_0045.py
+++ b/slixmpp/plugins/xep_0045.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
@@ -9,13 +9,13 @@ from __future__ import with_statement
import logging
-from sleekxmpp import Presence
-from sleekxmpp.plugins import BasePlugin, register_plugin
-from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, JID, ET
-from sleekxmpp.xmlstream.handler.callback import Callback
-from sleekxmpp.xmlstream.matcher.xpath import MatchXPath
-from sleekxmpp.xmlstream.matcher.xmlmask import MatchXMLMask
-from sleekxmpp.exceptions import IqError, IqTimeout
+from slixmpp import Presence
+from slixmpp.plugins import BasePlugin, register_plugin
+from slixmpp.xmlstream import register_stanza_plugin, ElementBase, JID, ET
+from slixmpp.xmlstream.handler.callback import Callback
+from slixmpp.xmlstream.matcher.xpath import MatchXPath
+from slixmpp.xmlstream.matcher.xmlmask import MatchXMLMask
+from slixmpp.exceptions import IqError, IqTimeout
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0047/__init__.py b/slixmpp/plugins/xep_0047/__init__.py
new file mode 100644
index 0000000..5bb9e7c
--- /dev/null
+++ b/slixmpp/plugins/xep_0047/__init__.py
@@ -0,0 +1,21 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0047 import stanza
+from slixmpp.plugins.xep_0047.stanza import Open, Close, Data
+from slixmpp.plugins.xep_0047.stream import IBBytestream
+from slixmpp.plugins.xep_0047.ibb import XEP_0047
+
+
+register_plugin(XEP_0047)
+
+
+# Retain some backwards compatibility
+xep_0047 = XEP_0047
diff --git a/sleekxmpp/plugins/xep_0047/ibb.py b/slixmpp/plugins/xep_0047/ibb.py
index 62dddac..ce697f0 100644
--- a/sleekxmpp/plugins/xep_0047/ibb.py
+++ b/slixmpp/plugins/xep_0047/ibb.py
@@ -2,13 +2,13 @@ import uuid
import logging
import threading
-from sleekxmpp import Message, Iq
-from sleekxmpp.exceptions import XMPPError
-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.xep_0047 import stanza, Open, Close, Data, IBBytestream
+from slixmpp import Message, Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0047 import stanza, Open, Close, Data, IBBytestream
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0047/stanza.py b/slixmpp/plugins/xep_0047/stanza.py
index 7e5d2fe..6219907 100644
--- a/sleekxmpp/plugins/xep_0047/stanza.py
+++ b/slixmpp/plugins/xep_0047/stanza.py
@@ -1,9 +1,9 @@
import re
import base64
-from sleekxmpp.util import bytes
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.util import bytes
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import ElementBase
VALID_B64 = re.compile(r'[A-Za-z0-9\+\/]*=*')
diff --git a/sleekxmpp/plugins/xep_0047/stream.py b/slixmpp/plugins/xep_0047/stream.py
index 9651edf..d323597 100644
--- a/sleekxmpp/plugins/xep_0047/stream.py
+++ b/slixmpp/plugins/xep_0047/stream.py
@@ -2,9 +2,9 @@ import socket
import threading
import logging
-from sleekxmpp.stanza import Iq
-from sleekxmpp.util import Queue
-from sleekxmpp.exceptions import XMPPError
+from slixmpp.stanza import Iq
+from slixmpp.util import Queue
+from slixmpp.exceptions import XMPPError
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0048/__init__.py b/slixmpp/plugins/xep_0048/__init__.py
new file mode 100644
index 0000000..d19f12a
--- /dev/null
+++ b/slixmpp/plugins/xep_0048/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0048.stanza import Bookmarks, Conference, URL
+from slixmpp.plugins.xep_0048.bookmarks import XEP_0048
+
+
+register_plugin(XEP_0048)
diff --git a/sleekxmpp/plugins/xep_0048/bookmarks.py b/slixmpp/plugins/xep_0048/bookmarks.py
index 0bb5ae3..fa76df3 100644
--- a/sleekxmpp/plugins/xep_0048/bookmarks.py
+++ b/slixmpp/plugins/xep_0048/bookmarks.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0048 import stanza, Bookmarks, Conference, URL
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0048 import stanza, Bookmarks, Conference, URL
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0048/stanza.py b/slixmpp/plugins/xep_0048/stanza.py
index 2182939..c158535 100644
--- a/sleekxmpp/plugins/xep_0048/stanza.py
+++ b/slixmpp/plugins/xep_0048/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ET, ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ET, ElementBase, register_stanza_plugin
class Bookmarks(ElementBase):
diff --git a/slixmpp/plugins/xep_0049/__init__.py b/slixmpp/plugins/xep_0049/__init__.py
new file mode 100644
index 0000000..396be75
--- /dev/null
+++ b/slixmpp/plugins/xep_0049/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0049.stanza import PrivateXML
+from slixmpp.plugins.xep_0049.private_storage import XEP_0049
+
+
+register_plugin(XEP_0049)
diff --git a/sleekxmpp/plugins/xep_0049/private_storage.py b/slixmpp/plugins/xep_0049/private_storage.py
index ef6cbdd..99a04fe 100644
--- a/sleekxmpp/plugins/xep_0049/private_storage.py
+++ b/slixmpp/plugins/xep_0049/private_storage.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0049 import stanza, PrivateXML
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0049 import stanza, PrivateXML
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0049/stanza.py b/slixmpp/plugins/xep_0049/stanza.py
index d424e2f..a8d425b 100644
--- a/sleekxmpp/plugins/xep_0049/stanza.py
+++ b/slixmpp/plugins/xep_0049/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ET, ElementBase
+from slixmpp.xmlstream import ET, ElementBase
class PrivateXML(ElementBase):
diff --git a/slixmpp/plugins/xep_0050/__init__.py b/slixmpp/plugins/xep_0050/__init__.py
new file mode 100644
index 0000000..5a2d480
--- /dev/null
+++ b/slixmpp/plugins/xep_0050/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0050.stanza import Command
+from slixmpp.plugins.xep_0050.adhoc import XEP_0050
+
+
+register_plugin(XEP_0050)
+
+
+# Retain some backwards compatibility
+xep_0050 = XEP_0050
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/slixmpp/plugins/xep_0050/adhoc.py
index e5594c3..01d3648 100644
--- a/sleekxmpp/plugins/xep_0050/adhoc.py
+++ b/slixmpp/plugins/xep_0050/adhoc.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,15 +9,15 @@
import logging
import time
-from sleekxmpp import Iq
-from sleekxmpp.exceptions import IqError
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0050 import stanza
-from sleekxmpp.plugins.xep_0050 import Command
-from sleekxmpp.plugins.xep_0004 import Form
+from slixmpp import Iq
+from slixmpp.exceptions import IqError
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0050 import stanza
+from slixmpp.plugins.xep_0050 import Command
+from slixmpp.plugins.xep_0004 import Form
log = logging.getLogger(__name__)
@@ -445,7 +445,7 @@ class XEP_0050(BasePlugin):
Arguments:
jid -- The JID to query for commands.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the items.
@@ -489,7 +489,7 @@ class XEP_0050(BasePlugin):
timeout -- The length of time (in seconds) to wait for a
response before exiting the send call
if blocking is used. Defaults to
- sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler
function. Will be executed when a reply
stanza is received if flow=False.
diff --git a/sleekxmpp/plugins/xep_0050/stanza.py b/slixmpp/plugins/xep_0050/stanza.py
index 2367c77..9bae7d1 100644
--- a/sleekxmpp/plugins/xep_0050/stanza.py
+++ b/slixmpp/plugins/xep_0050/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class Command(ElementBase):
diff --git a/slixmpp/plugins/xep_0054/__init__.py b/slixmpp/plugins/xep_0054/__init__.py
new file mode 100644
index 0000000..2029b41
--- /dev/null
+++ b/slixmpp/plugins/xep_0054/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0054.stanza import VCardTemp
+from slixmpp.plugins.xep_0054.vcard_temp import XEP_0054
+
+
+register_plugin(XEP_0054)
diff --git a/sleekxmpp/plugins/xep_0054/stanza.py b/slixmpp/plugins/xep_0054/stanza.py
index 72da0b5..cdd6215 100644
--- a/sleekxmpp/plugins/xep_0054/stanza.py
+++ b/slixmpp/plugins/xep_0054/stanza.py
@@ -1,9 +1,9 @@
import base64
import datetime as dt
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin, JID
-from sleekxmpp.plugins import xep_0082
+from slixmpp.util import bytes
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin, JID
+from slixmpp.plugins import xep_0082
class VCardTemp(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0054/vcard_temp.py b/slixmpp/plugins/xep_0054/vcard_temp.py
index 97da8c7..9709c99 100644
--- a/sleekxmpp/plugins/xep_0054/vcard_temp.py
+++ b/slixmpp/plugins/xep_0054/vcard_temp.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import JID, Iq
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0054 import VCardTemp, stanza
+from slixmpp import JID, Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0054 import VCardTemp, stanza
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0059/__init__.py b/slixmpp/plugins/xep_0059/__init__.py
new file mode 100644
index 0000000..21a0e5c
--- /dev/null
+++ b/slixmpp/plugins/xep_0059/__init__.py
@@ -0,0 +1,18 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0059.stanza import Set
+from slixmpp.plugins.xep_0059.rsm import ResultIterator, XEP_0059
+
+
+register_plugin(XEP_0059)
+
+# Retain some backwards compatibility
+xep_0059 = XEP_0059
diff --git a/sleekxmpp/plugins/xep_0059/rsm.py b/slixmpp/plugins/xep_0059/rsm.py
index d73b45b..5876a9a 100644
--- a/sleekxmpp/plugins/xep_0059/rsm.py
+++ b/slixmpp/plugins/xep_0059/rsm.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-import sleekxmpp
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin, register_plugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0059 import stanza, Set
-from sleekxmpp.exceptions import XMPPError
+import slixmpp
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin, register_plugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0059 import stanza, Set
+from slixmpp.exceptions import XMPPError
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0059/stanza.py b/slixmpp/plugins/xep_0059/stanza.py
index 48f5c8a..e2701af 100644
--- a/sleekxmpp/plugins/xep_0059/stanza.py
+++ b/slixmpp/plugins/xep_0059/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
-from sleekxmpp.plugins.xep_0030.stanza.items import DiscoItems
+from slixmpp.xmlstream import ElementBase, ET
+from slixmpp.plugins.xep_0030.stanza.items import DiscoItems
class Set(ElementBase):
diff --git a/slixmpp/plugins/xep_0060/__init__.py b/slixmpp/plugins/xep_0060/__init__.py
new file mode 100644
index 0000000..6c4d842
--- /dev/null
+++ b/slixmpp/plugins/xep_0060/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0060.pubsub import XEP_0060
+from slixmpp.plugins.xep_0060 import stanza
+
+
+register_plugin(XEP_0060)
+
+
+# Retain some backwards compatibility
+xep_0060 = XEP_0060
diff --git a/sleekxmpp/plugins/xep_0060/pubsub.py b/slixmpp/plugins/xep_0060/pubsub.py
index bec5f56..223b014 100644
--- a/sleekxmpp/plugins/xep_0060/pubsub.py
+++ b/slixmpp/plugins/xep_0060/pubsub.py
@@ -1,18 +1,18 @@
"""
- 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 logging
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0060 import stanza
+from slixmpp.xmlstream import JID
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0060 import stanza
log = logging.getLogger(__name__)
@@ -178,7 +178,7 @@ class XEP_0060(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -225,7 +225,7 @@ class XEP_0060(BasePlugin):
timeout -- The length of time (in seconds) to wait for a
response before exiting the send call if blocking
is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -274,7 +274,7 @@ class XEP_0060(BasePlugin):
timeout -- The length of time (in seconds) to wait for a
response before exiting the send call if blocking
is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -345,7 +345,7 @@ class XEP_0060(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -369,7 +369,7 @@ class XEP_0060(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -390,7 +390,7 @@ class XEP_0060(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -411,7 +411,7 @@ class XEP_0060(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -453,7 +453,7 @@ class XEP_0060(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0060/stanza/__init__.py b/slixmpp/plugins/xep_0060/stanza/__init__.py
new file mode 100644
index 0000000..31c4ac6
--- /dev/null
+++ b/slixmpp/plugins/xep_0060/stanza/__init__.py
@@ -0,0 +1,12 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.xep_0060.stanza.pubsub import *
+from slixmpp.plugins.xep_0060.stanza.pubsub_owner import *
+from slixmpp.plugins.xep_0060.stanza.pubsub_event import *
+from slixmpp.plugins.xep_0060.stanza.pubsub_errors import *
diff --git a/sleekxmpp/plugins/xep_0060/stanza/base.py b/slixmpp/plugins/xep_0060/stanza/base.py
index d0b7851..b8f3d6c 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/base.py
+++ b/slixmpp/plugins/xep_0060/stanza/base.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ET
+from slixmpp.xmlstream import ET
class OptionalSetting(object):
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/slixmpp/plugins/xep_0060/stanza/pubsub.py
index c1907a1..b429391 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub.py
@@ -1,15 +1,15 @@
"""
- 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.
"""
-from sleekxmpp import Iq, Message
-from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
-from sleekxmpp.plugins import xep_0004
-from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
+from slixmpp import Iq, Message
+from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
+from slixmpp.plugins import xep_0004
+from slixmpp.plugins.xep_0060.stanza.base import OptionalSetting
class Pubsub(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py b/slixmpp/plugins/xep_0060/stanza/pubsub_errors.py
index 59cf1a5..3e72800 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub_errors.py
@@ -1,13 +1,13 @@
"""
- 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.
"""
-from sleekxmpp.stanza import Error
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
+from slixmpp.stanza import Error
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
class PubsubErrorCondition(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_event.py b/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
index 32f217f..1ba97c7 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_event.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
@@ -1,17 +1,17 @@
"""
- 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 datetime as dt
-from sleekxmpp import Message
-from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
-from sleekxmpp.plugins.xep_0004 import Form
-from sleekxmpp.plugins import xep_0082
+from slixmpp import Message
+from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
+from slixmpp.plugins.xep_0004 import Form
+from slixmpp.plugins import xep_0082
class Event(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py b/slixmpp/plugins/xep_0060/stanza/pubsub_owner.py
index d975a46..402e5e3 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_owner.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub_owner.py
@@ -1,17 +1,17 @@
"""
- 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.
"""
-from sleekxmpp import Iq
-from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
-from sleekxmpp.plugins.xep_0004 import Form
-from sleekxmpp.plugins.xep_0060.stanza.base import OptionalSetting
-from sleekxmpp.plugins.xep_0060.stanza.pubsub import Affiliations, Affiliation
-from sleekxmpp.plugins.xep_0060.stanza.pubsub import Configure, Subscriptions
+from slixmpp import Iq
+from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
+from slixmpp.plugins.xep_0004 import Form
+from slixmpp.plugins.xep_0060.stanza.base import OptionalSetting
+from slixmpp.plugins.xep_0060.stanza.pubsub import Affiliations, Affiliation
+from slixmpp.plugins.xep_0060.stanza.pubsub import Configure, Subscriptions
class PubsubOwner(ElementBase):
diff --git a/slixmpp/plugins/xep_0065/__init__.py b/slixmpp/plugins/xep_0065/__init__.py
new file mode 100644
index 0000000..2bfe007
--- /dev/null
+++ b/slixmpp/plugins/xep_0065/__init__.py
@@ -0,0 +1,7 @@
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0065.stanza import Socks5
+from slixmpp.plugins.xep_0065.proxy import XEP_0065
+
+
+register_plugin(XEP_0065)
diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/slixmpp/plugins/xep_0065/proxy.py
index fdd9f97..654d9dc 100644
--- a/sleekxmpp/plugins/xep_0065/proxy.py
+++ b/slixmpp/plugins/xep_0065/proxy.py
@@ -5,16 +5,16 @@ import socket
from hashlib import sha1
from uuid import uuid4
-from sleekxmpp.thirdparty.socks import socksocket, PROXY_TYPE_SOCKS5
+from slixmpp.thirdparty.socks import socksocket, PROXY_TYPE_SOCKS5
-from sleekxmpp.stanza import Iq
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.base import base_plugin
+from slixmpp.stanza import Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.base import base_plugin
-from sleekxmpp.plugins.xep_0065 import stanza, Socks5
+from slixmpp.plugins.xep_0065 import stanza, Socks5
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0065/stanza.py b/slixmpp/plugins/xep_0065/stanza.py
index e48bf1b..5ba15b3 100644
--- a/sleekxmpp/plugins/xep_0065/stanza.py
+++ b/slixmpp/plugins/xep_0065/stanza.py
@@ -1,5 +1,5 @@
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.jid import JID
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class Socks5(ElementBase):
diff --git a/slixmpp/plugins/xep_0066/__init__.py b/slixmpp/plugins/xep_0066/__init__.py
new file mode 100644
index 0000000..7f7e0eb
--- /dev/null
+++ b/slixmpp/plugins/xep_0066/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0066 import stanza
+from slixmpp.plugins.xep_0066.stanza import OOB, OOBTransfer
+from slixmpp.plugins.xep_0066.oob import XEP_0066
+
+
+register_plugin(XEP_0066)
+
+
+# Retain some backwards compatibility
+xep_0066 = XEP_0066
diff --git a/sleekxmpp/plugins/xep_0066/oob.py b/slixmpp/plugins/xep_0066/oob.py
index 959c15a..c9d4ae5 100644
--- a/sleekxmpp/plugins/xep_0066/oob.py
+++ b/slixmpp/plugins/xep_0066/oob.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.stanza import Message, Presence, Iq
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0066 import stanza
+from slixmpp.stanza import Message, Presence, Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0066 import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0066/stanza.py b/slixmpp/plugins/xep_0066/stanza.py
index 2138748..e1da5bd 100644
--- a/sleekxmpp/plugins/xep_0066/stanza.py
+++ b/slixmpp/plugins/xep_0066/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class OOBTransfer(ElementBase):
diff --git a/slixmpp/plugins/xep_0071/__init__.py b/slixmpp/plugins/xep_0071/__init__.py
new file mode 100644
index 0000000..19275c7
--- /dev/null
+++ b/slixmpp/plugins/xep_0071/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permissio
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0071.stanza import XHTML_IM
+from slixmpp.plugins.xep_0071.xhtml_im import XEP_0071
+
+
+register_plugin(XEP_0071)
diff --git a/sleekxmpp/plugins/xep_0071/stanza.py b/slixmpp/plugins/xep_0071/stanza.py
index d5ff1a1..d997cb3 100644
--- a/sleekxmpp/plugins/xep_0071/stanza.py
+++ b/slixmpp/plugins/xep_0071/stanza.py
@@ -1,15 +1,15 @@
"""
- 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.
"""
-from sleekxmpp.stanza import Message
-from sleekxmpp.util import unicode
-from sleekxmpp.thirdparty import OrderedDict
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin, tostring
+from slixmpp.stanza import Message
+from slixmpp.util import unicode
+from slixmpp.thirdparty import OrderedDict
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin, tostring
XHTML_NS = 'http://www.w3.org/1999/xhtml'
diff --git a/sleekxmpp/plugins/xep_0071/xhtml_im.py b/slixmpp/plugins/xep_0071/xhtml_im.py
index 096a00a..0b41212 100644
--- a/sleekxmpp/plugins/xep_0071/xhtml_im.py
+++ b/slixmpp/plugins/xep_0071/xhtml_im.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.stanza import Message
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0071 import stanza, XHTML_IM
+from slixmpp.stanza import Message
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0071 import stanza, XHTML_IM
class XEP_0071(BasePlugin):
diff --git a/slixmpp/plugins/xep_0077/__init__.py b/slixmpp/plugins/xep_0077/__init__.py
new file mode 100644
index 0000000..a73cfae
--- /dev/null
+++ b/slixmpp/plugins/xep_0077/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0077.stanza import Register, RegisterFeature
+from slixmpp.plugins.xep_0077.register import XEP_0077
+
+
+register_plugin(XEP_0077)
+
+
+# Retain some backwards compatibility
+xep_0077 = XEP_0077
diff --git a/sleekxmpp/plugins/xep_0077/register.py b/slixmpp/plugins/xep_0077/register.py
index ee07548..d83ff1a 100644
--- a/sleekxmpp/plugins/xep_0077/register.py
+++ b/slixmpp/plugins/xep_0077/register.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,10 +9,10 @@
import logging
import ssl
-from sleekxmpp.stanza import StreamFeatures, Iq
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0077 import stanza, Register, RegisterFeature
+from slixmpp.stanza import StreamFeatures, Iq
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0077 import stanza, Register, RegisterFeature
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0077/stanza.py b/slixmpp/plugins/xep_0077/stanza.py
index e06c191..6ac543c 100644
--- a/sleekxmpp/plugins/xep_0077/stanza.py
+++ b/slixmpp/plugins/xep_0077/stanza.py
@@ -1,14 +1,14 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
from __future__ import unicode_literals
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class Register(ElementBase):
diff --git a/slixmpp/plugins/xep_0078/__init__.py b/slixmpp/plugins/xep_0078/__init__.py
new file mode 100644
index 0000000..21bdc19
--- /dev/null
+++ b/slixmpp/plugins/xep_0078/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0078 import stanza
+from slixmpp.plugins.xep_0078.stanza import IqAuth, AuthFeature
+from slixmpp.plugins.xep_0078.legacyauth import XEP_0078
+
+
+register_plugin(XEP_0078)
+
+
+# Retain some backwards compatibility
+xep_0078 = XEP_0078
diff --git a/sleekxmpp/plugins/xep_0078/legacyauth.py b/slixmpp/plugins/xep_0078/legacyauth.py
index da6bfa2..d3826e5 100644
--- a/sleekxmpp/plugins/xep_0078/legacyauth.py
+++ b/slixmpp/plugins/xep_0078/legacyauth.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
@@ -12,12 +12,12 @@ import hashlib
import random
import sys
-from sleekxmpp.jid import JID
-from sleekxmpp.exceptions import IqError, IqTimeout
-from sleekxmpp.stanza import Iq, StreamFeatures
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0078 import stanza
+from slixmpp.jid import JID
+from slixmpp.exceptions import IqError, IqTimeout
+from slixmpp.stanza import Iq, StreamFeatures
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0078 import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0078/stanza.py b/slixmpp/plugins/xep_0078/stanza.py
index c8b2607..7dc9401 100644
--- a/sleekxmpp/plugins/xep_0078/stanza.py
+++ b/slixmpp/plugins/xep_0078/stanza.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
class IqAuth(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0079/__init__.py b/slixmpp/plugins/xep_0079/__init__.py
index 09e6671..864c901 100644
--- a/sleekxmpp/plugins/xep_0079/__init__.py
+++ b/slixmpp/plugins/xep_0079/__init__.py
@@ -1,18 +1,18 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins.base import register_plugin
+from slixmpp.plugins.base import register_plugin
-from sleekxmpp.plugins.xep_0079.stanza import (
+from slixmpp.plugins.xep_0079.stanza import (
AMP, Rule, InvalidRules, UnsupportedConditions,
UnsupportedActions, FailedRules, FailedRule,
AMPFeature)
-from sleekxmpp.plugins.xep_0079.amp import XEP_0079
+from slixmpp.plugins.xep_0079.amp import XEP_0079
register_plugin(XEP_0079)
diff --git a/sleekxmpp/plugins/xep_0079/amp.py b/slixmpp/plugins/xep_0079/amp.py
index 918fb84..6e65d02 100644
--- a/sleekxmpp/plugins/xep_0079/amp.py
+++ b/slixmpp/plugins/xep_0079/amp.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
import logging
-from sleekxmpp.stanza import Message, Error, StreamFeatures
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.matcher import StanzaPath, MatchMany
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0079 import stanza
+from slixmpp.stanza import Message, Error, StreamFeatures
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.matcher import StanzaPath, MatchMany
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0079 import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0079/stanza.py b/slixmpp/plugins/xep_0079/stanza.py
index cb6932d..e3e1553 100644
--- a/sleekxmpp/plugins/xep_0079/stanza.py
+++ b/slixmpp/plugins/xep_0079/stanza.py
@@ -1,14 +1,14 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
from __future__ import unicode_literals
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class AMP(ElementBase):
diff --git a/slixmpp/plugins/xep_0080/__init__.py b/slixmpp/plugins/xep_0080/__init__.py
new file mode 100644
index 0000000..c487ef9
--- /dev/null
+++ b/slixmpp/plugins/xep_0080/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0080.stanza import Geoloc
+from slixmpp.plugins.xep_0080.geoloc import XEP_0080
+
+
+register_plugin(XEP_0080)
diff --git a/sleekxmpp/plugins/xep_0080/geoloc.py b/slixmpp/plugins/xep_0080/geoloc.py
index ba594cc..320bb95 100644
--- a/sleekxmpp/plugins/xep_0080/geoloc.py
+++ b/slixmpp/plugins/xep_0080/geoloc.py
@@ -1,17 +1,17 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-import sleekxmpp
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0080 import stanza, Geoloc
+import slixmpp
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0080 import stanza, Geoloc
log = logging.getLogger(__name__)
@@ -80,7 +80,7 @@ class XEP_0080(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -113,7 +113,7 @@ class XEP_0080(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/sleekxmpp/plugins/xep_0080/stanza.py b/slixmpp/plugins/xep_0080/stanza.py
index 8f46651..e25fea4 100644
--- a/sleekxmpp/plugins/xep_0080/stanza.py
+++ b/slixmpp/plugins/xep_0080/stanza.py
@@ -1,13 +1,13 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.plugins import xep_0082
+from slixmpp.xmlstream import ElementBase
+from slixmpp.plugins import xep_0082
class Geoloc(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0082.py b/slixmpp/plugins/xep_0082.py
index 26eb68f..2443662 100644
--- a/sleekxmpp/plugins/xep_0082.py
+++ b/slixmpp/plugins/xep_0082.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import datetime as dt
-from sleekxmpp.plugins import BasePlugin, register_plugin
-from sleekxmpp.thirdparty import tzutc, tzoffset, parse_iso
+from slixmpp.plugins import BasePlugin, register_plugin
+from slixmpp.thirdparty import tzutc, tzoffset, parse_iso
# =====================================================================
diff --git a/slixmpp/plugins/xep_0084/__init__.py b/slixmpp/plugins/xep_0084/__init__.py
new file mode 100644
index 0000000..aa5fdae
--- /dev/null
+++ b/slixmpp/plugins/xep_0084/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0084 import stanza
+from slixmpp.plugins.xep_0084.stanza import Data, MetaData
+from slixmpp.plugins.xep_0084.avatar import XEP_0084
+
+
+register_plugin(XEP_0084)
diff --git a/sleekxmpp/plugins/xep_0084/avatar.py b/slixmpp/plugins/xep_0084/avatar.py
index 677a888..7f8eba5 100644
--- a/sleekxmpp/plugins/xep_0084/avatar.py
+++ b/slixmpp/plugins/xep_0084/avatar.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,12 +9,12 @@
import hashlib
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins.xep_0084 import stanza, Data, MetaData
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins.xep_0084 import stanza, Data, MetaData
log = logging.getLogger(__name__)
@@ -98,7 +98,7 @@ class XEP_0084(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/sleekxmpp/plugins/xep_0084/stanza.py b/slixmpp/plugins/xep_0084/stanza.py
index 22f11b7..174a107 100644
--- a/sleekxmpp/plugins/xep_0084/stanza.py
+++ b/slixmpp/plugins/xep_0084/stanza.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
from base64 import b64encode, b64decode
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import ET, ElementBase, register_stanza_plugin
+from slixmpp.util import bytes
+from slixmpp.xmlstream import ET, ElementBase, register_stanza_plugin
class Data(ElementBase):
diff --git a/slixmpp/plugins/xep_0085/__init__.py b/slixmpp/plugins/xep_0085/__init__.py
new file mode 100644
index 0000000..9b9da99
--- /dev/null
+++ b/slixmpp/plugins/xep_0085/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permissio
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0085.stanza import ChatState
+from slixmpp.plugins.xep_0085.chat_states import XEP_0085
+
+
+register_plugin(XEP_0085)
+
+
+# Retain some backwards compatibility
+xep_0085 = XEP_0085
diff --git a/sleekxmpp/plugins/xep_0085/chat_states.py b/slixmpp/plugins/xep_0085/chat_states.py
index 17f82af..1aab9ea 100644
--- a/sleekxmpp/plugins/xep_0085/chat_states.py
+++ b/slixmpp/plugins/xep_0085/chat_states.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
import logging
-import sleekxmpp
-from sleekxmpp.stanza import Message
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0085 import stanza, ChatState
+import slixmpp
+from slixmpp.stanza import Message
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0085 import stanza, ChatState
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0085/stanza.py b/slixmpp/plugins/xep_0085/stanza.py
index c2cafb1..d1a5b15 100644
--- a/sleekxmpp/plugins/xep_0085/stanza.py
+++ b/slixmpp/plugins/xep_0085/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
-import sleekxmpp
-from sleekxmpp.xmlstream import ElementBase, ET
+import slixmpp
+from slixmpp.xmlstream import ElementBase, ET
class ChatState(ElementBase):
diff --git a/slixmpp/plugins/xep_0086/__init__.py b/slixmpp/plugins/xep_0086/__init__.py
new file mode 100644
index 0000000..c6946e5
--- /dev/null
+++ b/slixmpp/plugins/xep_0086/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0086.stanza import LegacyError
+from slixmpp.plugins.xep_0086.legacy_error import XEP_0086
+
+
+register_plugin(XEP_0086)
+
+
+# Retain some backwards compatibility
+xep_0086 = XEP_0086
diff --git a/sleekxmpp/plugins/xep_0086/legacy_error.py b/slixmpp/plugins/xep_0086/legacy_error.py
index f7d0ac9..d56c4db 100644
--- a/sleekxmpp/plugins/xep_0086/legacy_error.py
+++ b/slixmpp/plugins/xep_0086/legacy_error.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.stanza import Error
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0086 import stanza, LegacyError
+from slixmpp.stanza import Error
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0086 import stanza, LegacyError
class XEP_0086(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0086/stanza.py b/slixmpp/plugins/xep_0086/stanza.py
index d490980..cbc9429 100644
--- a/sleekxmpp/plugins/xep_0086/stanza.py
+++ b/slixmpp/plugins/xep_0086/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.stanza import Error
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
+from slixmpp.stanza import Error
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
class LegacyError(ElementBase):
diff --git a/slixmpp/plugins/xep_0091/__init__.py b/slixmpp/plugins/xep_0091/__init__.py
new file mode 100644
index 0000000..e5d166b
--- /dev/null
+++ b/slixmpp/plugins/xep_0091/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0091 import stanza
+from slixmpp.plugins.xep_0091.stanza import LegacyDelay
+from slixmpp.plugins.xep_0091.legacy_delay import XEP_0091
+
+
+register_plugin(XEP_0091)
diff --git a/sleekxmpp/plugins/xep_0091/legacy_delay.py b/slixmpp/plugins/xep_0091/legacy_delay.py
index 7323d46..6aef2ba 100644
--- a/sleekxmpp/plugins/xep_0091/legacy_delay.py
+++ b/slixmpp/plugins/xep_0091/legacy_delay.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.stanza import Message, Presence
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0091 import stanza
+from slixmpp.stanza import Message, Presence
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0091 import stanza
class XEP_0091(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0091/stanza.py b/slixmpp/plugins/xep_0091/stanza.py
index 17e5576..ac6457e 100644
--- a/sleekxmpp/plugins/xep_0091/stanza.py
+++ b/slixmpp/plugins/xep_0091/stanza.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import datetime as dt
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.plugins import xep_0082
+from slixmpp.jid import JID
+from slixmpp.xmlstream import ElementBase
+from slixmpp.plugins import xep_0082
class LegacyDelay(ElementBase):
diff --git a/slixmpp/plugins/xep_0092/__init__.py b/slixmpp/plugins/xep_0092/__init__.py
new file mode 100644
index 0000000..93743a1
--- /dev/null
+++ b/slixmpp/plugins/xep_0092/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0092 import stanza
+from slixmpp.plugins.xep_0092.stanza import Version
+from slixmpp.plugins.xep_0092.version import XEP_0092
+
+
+register_plugin(XEP_0092)
+
+
+# Retain some backwards compatibility
+xep_0092 = XEP_0092
diff --git a/sleekxmpp/plugins/xep_0092/stanza.py b/slixmpp/plugins/xep_0092/stanza.py
index 77654e3..04097a8 100644
--- a/sleekxmpp/plugins/xep_0092/stanza.py
+++ b/slixmpp/plugins/xep_0092/stanza.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class Version(ElementBase):
@@ -23,7 +23,7 @@ class Version(ElementBase):
<iq type="result">
<query xmlns="jabber:iq:version">
- <name>SleekXMPP</name>
+ <name>Slixmpp</name>
<version>1.0</version>
<os>Linux</os>
</query>
diff --git a/sleekxmpp/plugins/xep_0092/version.py b/slixmpp/plugins/xep_0092/version.py
index b16ad51..398f6b3 100644
--- a/sleekxmpp/plugins/xep_0092/version.py
+++ b/slixmpp/plugins/xep_0092/version.py
@@ -1,20 +1,20 @@
"""
- 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 logging
-import sleekxmpp
-from sleekxmpp import Iq
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0092 import Version, stanza
+import slixmpp
+from slixmpp import Iq
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0092 import Version, stanza
log = logging.getLogger(__name__)
@@ -31,8 +31,8 @@ class XEP_0092(BasePlugin):
dependencies = set(['xep_0030'])
stanza = stanza
default_config = {
- 'software_name': 'SleekXMPP',
- 'version': sleekxmpp.__version__,
+ 'software_name': 'Slixmpp',
+ 'version': slixmpp.__version__,
'os': ''
}
diff --git a/slixmpp/plugins/xep_0095/__init__.py b/slixmpp/plugins/xep_0095/__init__.py
new file mode 100644
index 0000000..3c6380e
--- /dev/null
+++ b/slixmpp/plugins/xep_0095/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0095 import stanza
+from slixmpp.plugins.xep_0095.stanza import SI
+from slixmpp.plugins.xep_0095.stream_initiation import XEP_0095
+
+
+register_plugin(XEP_0095)
diff --git a/sleekxmpp/plugins/xep_0095/stanza.py b/slixmpp/plugins/xep_0095/stanza.py
index 34999a1..62b5f6f 100644
--- a/sleekxmpp/plugins/xep_0095/stanza.py
+++ b/slixmpp/plugins/xep_0095/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class SI(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0095/stream_initiation.py b/slixmpp/plugins/xep_0095/stream_initiation.py
index 927248a..cbf3c3f 100644
--- a/sleekxmpp/plugins/xep_0095/stream_initiation.py
+++ b/slixmpp/plugins/xep_0095/stream_initiation.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -11,13 +11,13 @@ import threading
from uuid import uuid4
-from sleekxmpp import Iq, Message
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins.xep_0095 import stanza, SI
+from slixmpp import Iq, Message
+from slixmpp.exceptions import XMPPError
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins.xep_0095 import stanza, SI
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0096/__init__.py b/slixmpp/plugins/xep_0096/__init__.py
new file mode 100644
index 0000000..866a982
--- /dev/null
+++ b/slixmpp/plugins/xep_0096/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0096 import stanza
+from slixmpp.plugins.xep_0096.stanza import File
+from slixmpp.plugins.xep_0096.file_transfer import XEP_0096
+
+
+register_plugin(XEP_0096)
diff --git a/sleekxmpp/plugins/xep_0096/file_transfer.py b/slixmpp/plugins/xep_0096/file_transfer.py
index 6873c7f..462e7c1 100644
--- a/sleekxmpp/plugins/xep_0096/file_transfer.py
+++ b/slixmpp/plugins/xep_0096/file_transfer.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq, Message
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins.xep_0096 import stanza, File
+from slixmpp import Iq, Message
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins.xep_0096 import stanza, File
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0096/stanza.py b/slixmpp/plugins/xep_0096/stanza.py
index 65eb5bc..d3781c8 100644
--- a/sleekxmpp/plugins/xep_0096/stanza.py
+++ b/slixmpp/plugins/xep_0096/stanza.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import datetime as dt
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
-from sleekxmpp.plugins import xep_0082
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.plugins import xep_0082
class File(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0106.py b/slixmpp/plugins/xep_0106.py
index 1859a77..a471795 100644
--- a/sleekxmpp/plugins/xep_0106.py
+++ b/slixmpp/plugins/xep_0106.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins import BasePlugin, register_plugin
+from slixmpp.plugins import BasePlugin, register_plugin
class XEP_0106(BasePlugin):
diff --git a/slixmpp/plugins/xep_0107/__init__.py b/slixmpp/plugins/xep_0107/__init__.py
new file mode 100644
index 0000000..778fd33
--- /dev/null
+++ b/slixmpp/plugins/xep_0107/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0107 import stanza
+from slixmpp.plugins.xep_0107.stanza import UserMood
+from slixmpp.plugins.xep_0107.user_mood import XEP_0107
+
+
+register_plugin(XEP_0107)
diff --git a/sleekxmpp/plugins/xep_0107/stanza.py b/slixmpp/plugins/xep_0107/stanza.py
index 2c5814e..05967de 100644
--- a/sleekxmpp/plugins/xep_0107/stanza.py
+++ b/slixmpp/plugins/xep_0107/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class UserMood(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0107/user_mood.py b/slixmpp/plugins/xep_0107/user_mood.py
index 2d2f355..30ddd64 100644
--- a/sleekxmpp/plugins/xep_0107/user_mood.py
+++ b/slixmpp/plugins/xep_0107/user_mood.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Message
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0107 import stanza, UserMood
+from slixmpp import Message
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0107 import stanza, UserMood
log = logging.getLogger(__name__)
@@ -55,7 +55,7 @@ class XEP_0107(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -80,7 +80,7 @@ class XEP_0107(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0108/__init__.py b/slixmpp/plugins/xep_0108/__init__.py
new file mode 100644
index 0000000..54cc5dd
--- /dev/null
+++ b/slixmpp/plugins/xep_0108/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0108 import stanza
+from slixmpp.plugins.xep_0108.stanza import UserActivity
+from slixmpp.plugins.xep_0108.user_activity import XEP_0108
+
+
+register_plugin(XEP_0108)
diff --git a/sleekxmpp/plugins/xep_0108/stanza.py b/slixmpp/plugins/xep_0108/stanza.py
index 4650160..d65dfdf 100644
--- a/sleekxmpp/plugins/xep_0108/stanza.py
+++ b/slixmpp/plugins/xep_0108/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class UserActivity(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0108/user_activity.py b/slixmpp/plugins/xep_0108/user_activity.py
index 3a2f49b..4e0bfba 100644
--- a/sleekxmpp/plugins/xep_0108/user_activity.py
+++ b/slixmpp/plugins/xep_0108/user_activity.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0108 import stanza, UserActivity
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0108 import stanza, UserActivity
log = logging.getLogger(__name__)
@@ -50,7 +50,7 @@ class XEP_0108(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -75,7 +75,7 @@ class XEP_0108(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0115/__init__.py b/slixmpp/plugins/xep_0115/__init__.py
new file mode 100644
index 0000000..51c437c
--- /dev/null
+++ b/slixmpp/plugins/xep_0115/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0115.stanza import Capabilities
+from slixmpp.plugins.xep_0115.static import StaticCaps
+from slixmpp.plugins.xep_0115.caps import XEP_0115
+
+
+register_plugin(XEP_0115)
+
+
+# Retain some backwards compatibility
+xep_0115 = XEP_0115
diff --git a/sleekxmpp/plugins/xep_0115/caps.py b/slixmpp/plugins/xep_0115/caps.py
index 41b5c52..378c6ae 100644
--- a/sleekxmpp/plugins/xep_0115/caps.py
+++ b/slixmpp/plugins/xep_0115/caps.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -11,14 +11,14 @@ import hashlib
import base64
import threading
-from sleekxmpp import __version__
-from sleekxmpp.stanza import StreamFeatures, Presence, Iq
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.exceptions import XMPPError, IqError, IqTimeout
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0115 import stanza, StaticCaps
+from slixmpp import __version__
+from slixmpp.stanza import StreamFeatures, Presence, Iq
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.exceptions import XMPPError, IqError, IqTimeout
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0115 import stanza, StaticCaps
log = logging.getLogger(__name__)
@@ -46,7 +46,7 @@ class XEP_0115(BasePlugin):
'md5': hashlib.md5}
if self.caps_node is None:
- self.caps_node = 'http://sleekxmpp.com/ver/%s' % __version__
+ self.caps_node = 'http://slixmpp.com/ver/%s' % __version__
register_stanza_plugin(Presence, stanza.Capabilities)
register_stanza_plugin(StreamFeatures, stanza.Capabilities)
diff --git a/sleekxmpp/plugins/xep_0115/stanza.py b/slixmpp/plugins/xep_0115/stanza.py
index 3e80b5c..36fb173 100644
--- a/sleekxmpp/plugins/xep_0115/stanza.py
+++ b/slixmpp/plugins/xep_0115/stanza.py
@@ -1,14 +1,14 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
from __future__ import unicode_literals
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class Capabilities(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0115/static.py b/slixmpp/plugins/xep_0115/static.py
index f83c244..0d1caa0 100644
--- a/sleekxmpp/plugins/xep_0115/static.py
+++ b/slixmpp/plugins/xep_0115/static.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.exceptions import IqError, IqTimeout
+from slixmpp.xmlstream import JID
+from slixmpp.exceptions import IqError, IqTimeout
log = logging.getLogger(__name__)
@@ -43,7 +43,7 @@ class StaticCaps(object):
The data parameter may provide:
feature -- The feature to check for support.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the info.
@@ -87,7 +87,7 @@ class StaticCaps(object):
itype -- The type of the identity to check.
lang -- The language of the identity to check.
local -- If true, then the query is for a JID/node
- combination handled by this Sleek instance and
+ combination handled by this Slixmpp instance and
no stanzas need to be sent.
Otherwise, a disco stanza must be sent to the
remove JID to retrieve the info.
diff --git a/slixmpp/plugins/xep_0118/__init__.py b/slixmpp/plugins/xep_0118/__init__.py
new file mode 100644
index 0000000..7ad4899
--- /dev/null
+++ b/slixmpp/plugins/xep_0118/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0118 import stanza
+from slixmpp.plugins.xep_0118.stanza import UserTune
+from slixmpp.plugins.xep_0118.user_tune import XEP_0118
+
+
+register_plugin(XEP_0118)
diff --git a/sleekxmpp/plugins/xep_0118/stanza.py b/slixmpp/plugins/xep_0118/stanza.py
index 3fdab28..4f5a179 100644
--- a/sleekxmpp/plugins/xep_0118/stanza.py
+++ b/slixmpp/plugins/xep_0118/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class UserTune(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0118/user_tune.py b/slixmpp/plugins/xep_0118/user_tune.py
index 1bb0012..53eb458 100644
--- a/sleekxmpp/plugins/xep_0118/user_tune.py
+++ b/slixmpp/plugins/xep_0118/user_tune.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0118 import stanza, UserTune
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0118 import stanza, UserTune
log = logging.getLogger(__name__)
@@ -53,7 +53,7 @@ class XEP_0118(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -83,7 +83,7 @@ class XEP_0118(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0128/__init__.py b/slixmpp/plugins/xep_0128/__init__.py
new file mode 100644
index 0000000..fb6dbf7
--- /dev/null
+++ b/slixmpp/plugins/xep_0128/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0128.static import StaticExtendedDisco
+from slixmpp.plugins.xep_0128.extended_disco import XEP_0128
+
+
+register_plugin(XEP_0128)
+
+
+# Retain some backwards compatibility
+xep_0128 = XEP_0128
diff --git a/sleekxmpp/plugins/xep_0128/extended_disco.py b/slixmpp/plugins/xep_0128/extended_disco.py
index d785aff..5cc1d35 100644
--- a/sleekxmpp/plugins/xep_0128/extended_disco.py
+++ b/slixmpp/plugins/xep_0128/extended_disco.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-import sleekxmpp
-from sleekxmpp import Iq
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0004 import Form
-from sleekxmpp.plugins.xep_0030 import DiscoInfo
-from sleekxmpp.plugins.xep_0128 import StaticExtendedDisco
+import slixmpp
+from slixmpp import Iq
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0004 import Form
+from slixmpp.plugins.xep_0030 import DiscoInfo
+from slixmpp.plugins.xep_0128 import StaticExtendedDisco
class XEP_0128(BasePlugin):
@@ -31,7 +31,7 @@ class XEP_0128(BasePlugin):
disco -- A reference to the XEP-0030 plugin.
static -- Object containing the default set of static
node handlers.
- xmpp -- The main SleekXMPP object.
+ xmpp -- The main Slixmpp object.
Methods:
set_extended_info -- Set extensions to a disco#info result.
diff --git a/sleekxmpp/plugins/xep_0128/static.py b/slixmpp/plugins/xep_0128/static.py
index 427011c..ab1ea59 100644
--- a/sleekxmpp/plugins/xep_0128/static.py
+++ b/slixmpp/plugins/xep_0128/static.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-import sleekxmpp
-from sleekxmpp.plugins.xep_0030 import StaticDisco
+import slixmpp
+from slixmpp.plugins.xep_0030 import StaticDisco
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0131/__init__.py b/slixmpp/plugins/xep_0131/__init__.py
new file mode 100644
index 0000000..4151cc7
--- /dev/null
+++ b/slixmpp/plugins/xep_0131/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0131 import stanza
+from slixmpp.plugins.xep_0131.stanza import Headers
+from slixmpp.plugins.xep_0131.headers import XEP_0131
+
+
+register_plugin(XEP_0131)
diff --git a/sleekxmpp/plugins/xep_0131/headers.py b/slixmpp/plugins/xep_0131/headers.py
index 3e47541..81fc918 100644
--- a/sleekxmpp/plugins/xep_0131/headers.py
+++ b/slixmpp/plugins/xep_0131/headers.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp import Message, Presence
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0131 import stanza
-from sleekxmpp.plugins.xep_0131.stanza import Headers
+from slixmpp import Message, Presence
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0131 import stanza
+from slixmpp.plugins.xep_0131.stanza import Headers
class XEP_0131(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0131/stanza.py b/slixmpp/plugins/xep_0131/stanza.py
index 347adf9..4077d57 100644
--- a/sleekxmpp/plugins/xep_0131/stanza.py
+++ b/slixmpp/plugins/xep_0131/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.thirdparty import OrderedDict
-from sleekxmpp.xmlstream import ET, ElementBase
+from slixmpp.thirdparty import OrderedDict
+from slixmpp.xmlstream import ET, ElementBase
class Headers(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0133.py b/slixmpp/plugins/xep_0133.py
index 7bbe4c3..a38a0fd 100644
--- a/sleekxmpp/plugins/xep_0133.py
+++ b/slixmpp/plugins/xep_0133.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins import BasePlugin, register_plugin
+from slixmpp.plugins import BasePlugin, register_plugin
class XEP_0133(BasePlugin):
diff --git a/slixmpp/plugins/xep_0152/__init__.py b/slixmpp/plugins/xep_0152/__init__.py
new file mode 100644
index 0000000..4e6d3a0
--- /dev/null
+++ b/slixmpp/plugins/xep_0152/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0152 import stanza
+from slixmpp.plugins.xep_0152.stanza import Reachability
+from slixmpp.plugins.xep_0152.reachability import XEP_0152
+
+
+register_plugin(XEP_0152)
diff --git a/sleekxmpp/plugins/xep_0152/reachability.py b/slixmpp/plugins/xep_0152/reachability.py
index 4cf8173..07d02b2 100644
--- a/sleekxmpp/plugins/xep_0152/reachability.py
+++ b/slixmpp/plugins/xep_0152/reachability.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0152 import stanza, Reachability
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0152 import stanza, Reachability
log = logging.getLogger(__name__)
@@ -47,7 +47,7 @@ class XEP_0152(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -80,7 +80,7 @@ class XEP_0152(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/sleekxmpp/plugins/xep_0152/stanza.py b/slixmpp/plugins/xep_0152/stanza.py
index bd173ce..661544e 100644
--- a/sleekxmpp/plugins/xep_0152/stanza.py
+++ b/slixmpp/plugins/xep_0152/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class Reachability(ElementBase):
diff --git a/slixmpp/plugins/xep_0153/__init__.py b/slixmpp/plugins/xep_0153/__init__.py
new file mode 100644
index 0000000..378cec9
--- /dev/null
+++ b/slixmpp/plugins/xep_0153/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0153.stanza import VCardTempUpdate
+from slixmpp.plugins.xep_0153.vcard_avatar import XEP_0153
+
+
+register_plugin(XEP_0153)
diff --git a/sleekxmpp/plugins/xep_0153/stanza.py b/slixmpp/plugins/xep_0153/stanza.py
index 4e6a660..fe8d5e9 100644
--- a/sleekxmpp/plugins/xep_0153/stanza.py
+++ b/slixmpp/plugins/xep_0153/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class VCardTempUpdate(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0153/vcard_avatar.py b/slixmpp/plugins/xep_0153/vcard_avatar.py
index ec1ae78..0220dfe 100644
--- a/sleekxmpp/plugins/xep_0153/vcard_avatar.py
+++ b/slixmpp/plugins/xep_0153/vcard_avatar.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -10,11 +10,11 @@ import hashlib
import logging
import threading
-from sleekxmpp.stanza import Presence
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0153 import stanza, VCardTempUpdate
+from slixmpp.stanza import Presence
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0153 import stanza, VCardTempUpdate
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0163.py b/slixmpp/plugins/xep_0163.py
index 2d1a63b..bd59e9a 100644
--- a/sleekxmpp/plugins/xep_0163.py
+++ b/slixmpp/plugins/xep_0163.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import BasePlugin, register_plugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.base import BasePlugin, register_plugin
log = logging.getLogger(__name__)
@@ -101,7 +101,7 @@ class XEP_0163(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0172/__init__.py b/slixmpp/plugins/xep_0172/__init__.py
new file mode 100644
index 0000000..6e8d25e
--- /dev/null
+++ b/slixmpp/plugins/xep_0172/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0172 import stanza
+from slixmpp.plugins.xep_0172.stanza import UserNick
+from slixmpp.plugins.xep_0172.user_nick import XEP_0172
+
+
+register_plugin(XEP_0172)
diff --git a/sleekxmpp/plugins/xep_0172/stanza.py b/slixmpp/plugins/xep_0172/stanza.py
index 110c237..305f3a0 100644
--- a/sleekxmpp/plugins/xep_0172/stanza.py
+++ b/slixmpp/plugins/xep_0172/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class UserNick(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0172/user_nick.py b/slixmpp/plugins/xep_0172/user_nick.py
index cab13c1..4ca7c8a 100644
--- a/sleekxmpp/plugins/xep_0172/user_nick.py
+++ b/slixmpp/plugins/xep_0172/user_nick.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.stanza.message import Message
-from sleekxmpp.stanza.presence import Presence
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import MatchXPath
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0172 import stanza, UserNick
+from slixmpp.stanza.message import Message
+from slixmpp.stanza.presence import Presence
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import MatchXPath
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0172 import stanza, UserNick
log = logging.getLogger(__name__)
@@ -55,7 +55,7 @@ class XEP_0172(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -79,7 +79,7 @@ class XEP_0172(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0184/__init__.py b/slixmpp/plugins/xep_0184/__init__.py
new file mode 100644
index 0000000..83c2d7c
--- /dev/null
+++ b/slixmpp/plugins/xep_0184/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0184.stanza import Request, Received
+from slixmpp.plugins.xep_0184.receipt import XEP_0184
+
+
+register_plugin(XEP_0184)
+
+
+# Retain some backwards compatibility
+xep_0184 = XEP_0184
diff --git a/sleekxmpp/plugins/xep_0184/receipt.py b/slixmpp/plugins/xep_0184/receipt.py
index 3e97d8d..9ca138b 100644
--- a/sleekxmpp/plugins/xep_0184/receipt.py
+++ b/slixmpp/plugins/xep_0184/receipt.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.stanza import Message
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0184 import stanza, Request, Received
+from slixmpp.stanza import Message
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0184 import stanza, Request, Received
class XEP_0184(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0184/stanza.py b/slixmpp/plugins/xep_0184/stanza.py
index a760703..16a640e 100644
--- a/sleekxmpp/plugins/xep_0184/stanza.py
+++ b/slixmpp/plugins/xep_0184/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream.stanzabase import ElementBase, ET
+from slixmpp.xmlstream.stanzabase import ElementBase, ET
class Request(ElementBase):
diff --git a/slixmpp/plugins/xep_0186/__init__.py b/slixmpp/plugins/xep_0186/__init__.py
new file mode 100644
index 0000000..0dc0933
--- /dev/null
+++ b/slixmpp/plugins/xep_0186/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0186 import stanza
+from slixmpp.plugins.xep_0186.stanza import Invisible, Visible
+from slixmpp.plugins.xep_0186.invisible_command import XEP_0186
+
+
+register_plugin(XEP_0186)
diff --git a/sleekxmpp/plugins/xep_0186/invisible_command.py b/slixmpp/plugins/xep_0186/invisible_command.py
index 15f63b2..1a521e7 100644
--- a/sleekxmpp/plugins/xep_0186/invisible_command.py
+++ b/slixmpp/plugins/xep_0186/invisible_command.py
@@ -1,17 +1,17 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0186 import stanza, Visible, Invisible
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0186 import stanza, Visible, Invisible
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0186/stanza.py b/slixmpp/plugins/xep_0186/stanza.py
index aadbaa1..1ae7e83 100644
--- a/sleekxmpp/plugins/xep_0186/stanza.py
+++ b/slixmpp/plugins/xep_0186/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class Invisible(ElementBase):
diff --git a/slixmpp/plugins/xep_0191/__init__.py b/slixmpp/plugins/xep_0191/__init__.py
new file mode 100644
index 0000000..cd75684
--- /dev/null
+++ b/slixmpp/plugins/xep_0191/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0191.stanza import Block, Unblock, BlockList
+from slixmpp.plugins.xep_0191.blocking import XEP_0191
+
+
+register_plugin(XEP_0191)
diff --git a/sleekxmpp/plugins/xep_0191/blocking.py b/slixmpp/plugins/xep_0191/blocking.py
index 5763231..92a5781 100644
--- a/sleekxmpp/plugins/xep_0191/blocking.py
+++ b/slixmpp/plugins/xep_0191/blocking.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin, JID
-from sleekxmpp.plugins.xep_0191 import stanza, Block, Unblock, BlockList
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin, JID
+from slixmpp.plugins.xep_0191 import stanza, Block, Unblock, BlockList
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0191/stanza.py b/slixmpp/plugins/xep_0191/stanza.py
index c5a284b..4dac7bf 100644
--- a/sleekxmpp/plugins/xep_0191/stanza.py
+++ b/slixmpp/plugins/xep_0191/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ET, ElementBase, JID
+from slixmpp.xmlstream import ET, ElementBase, JID
class BlockList(ElementBase):
diff --git a/slixmpp/plugins/xep_0196/__init__.py b/slixmpp/plugins/xep_0196/__init__.py
new file mode 100644
index 0000000..89f0f89
--- /dev/null
+++ b/slixmpp/plugins/xep_0196/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0196 import stanza
+from slixmpp.plugins.xep_0196.stanza import UserGaming
+from slixmpp.plugins.xep_0196.user_gaming import XEP_0196
+
+
+register_plugin(XEP_0196)
diff --git a/sleekxmpp/plugins/xep_0196/stanza.py b/slixmpp/plugins/xep_0196/stanza.py
index 571c89d..9c3cd0e 100644
--- a/sleekxmpp/plugins/xep_0196/stanza.py
+++ b/slixmpp/plugins/xep_0196/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class UserGaming(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0196/user_gaming.py b/slixmpp/plugins/xep_0196/user_gaming.py
index e78f1ac..cf940ce 100644
--- a/sleekxmpp/plugins/xep_0196/user_gaming.py
+++ b/slixmpp/plugins/xep_0196/user_gaming.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0196 import stanza, UserGaming
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0196 import stanza, UserGaming
log = logging.getLogger(__name__)
@@ -54,7 +54,7 @@ class XEP_0196(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -84,7 +84,7 @@ class XEP_0196(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0198/__init__.py b/slixmpp/plugins/xep_0198/__init__.py
new file mode 100644
index 0000000..bd70904
--- /dev/null
+++ b/slixmpp/plugins/xep_0198/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0198.stanza import Enable, Enabled
+from slixmpp.plugins.xep_0198.stanza import Resume, Resumed
+from slixmpp.plugins.xep_0198.stanza import Failed
+from slixmpp.plugins.xep_0198.stanza import StreamManagement
+from slixmpp.plugins.xep_0198.stanza import Ack, RequestAck
+
+from slixmpp.plugins.xep_0198.stream_management import XEP_0198
+
+
+register_plugin(XEP_0198)
diff --git a/sleekxmpp/plugins/xep_0198/stanza.py b/slixmpp/plugins/xep_0198/stanza.py
index 6461d76..b1c4c01 100644
--- a/sleekxmpp/plugins/xep_0198/stanza.py
+++ b/slixmpp/plugins/xep_0198/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.stanza import Error
-from sleekxmpp.xmlstream import ElementBase, StanzaBase
+from slixmpp.stanza import Error
+from slixmpp.xmlstream import ElementBase, StanzaBase
class Enable(StanzaBase):
diff --git a/sleekxmpp/plugins/xep_0198/stream_management.py b/slixmpp/plugins/xep_0198/stream_management.py
index 4802991..64052fc 100644
--- a/sleekxmpp/plugins/xep_0198/stream_management.py
+++ b/slixmpp/plugins/xep_0198/stream_management.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -10,12 +10,12 @@ import logging
import threading
import collections
-from sleekxmpp.stanza import Message, Presence, Iq, StreamFeatures
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback, Waiter
-from sleekxmpp.xmlstream.matcher import MatchXPath, MatchMany
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0198 import stanza
+from slixmpp.stanza import Message, Presence, Iq, StreamFeatures
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback, Waiter
+from slixmpp.xmlstream.matcher import MatchXPath, MatchMany
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0198 import stanza
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0199/__init__.py b/slixmpp/plugins/xep_0199/__init__.py
new file mode 100644
index 0000000..7c7bd22
--- /dev/null
+++ b/slixmpp/plugins/xep_0199/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0199.stanza import Ping
+from slixmpp.plugins.xep_0199.ping import XEP_0199
+
+
+register_plugin(XEP_0199)
+
+
+# Backwards compatibility for names
+xep_0199 = XEP_0199
+xep_0199.sendPing = xep_0199.send_ping
diff --git a/sleekxmpp/plugins/xep_0199/ping.py b/slixmpp/plugins/xep_0199/ping.py
index 836ff4a..5fdf79b 100644
--- a/sleekxmpp/plugins/xep_0199/ping.py
+++ b/slixmpp/plugins/xep_0199/ping.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
@@ -9,14 +9,14 @@
import time
import logging
-from sleekxmpp.jid import JID
-from sleekxmpp.stanza import Iq
-from sleekxmpp.exceptions import IqError, IqTimeout
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0199 import stanza, Ping
+from slixmpp.jid import JID
+from slixmpp.stanza import Iq
+from slixmpp.exceptions import IqError, IqTimeout
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0199 import stanza, Ping
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0199/stanza.py b/slixmpp/plugins/xep_0199/stanza.py
index 6586a76..425e891 100644
--- a/sleekxmpp/plugins/xep_0199/stanza.py
+++ b/slixmpp/plugins/xep_0199/stanza.py
@@ -1,13 +1,13 @@
"""
- 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 sleekxmpp
-from sleekxmpp.xmlstream import ElementBase
+import slixmpp
+from slixmpp.xmlstream import ElementBase
class Ping(ElementBase):
diff --git a/slixmpp/plugins/xep_0202/__init__.py b/slixmpp/plugins/xep_0202/__init__.py
new file mode 100644
index 0000000..1197eab
--- /dev/null
+++ b/slixmpp/plugins/xep_0202/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0202 import stanza
+from slixmpp.plugins.xep_0202.stanza import EntityTime
+from slixmpp.plugins.xep_0202.time import XEP_0202
+
+
+register_plugin(XEP_0202)
+
+
+# Retain some backwards compatibility
+xep_0202 = XEP_0202
diff --git a/sleekxmpp/plugins/xep_0202/stanza.py b/slixmpp/plugins/xep_0202/stanza.py
index b6ccc96..c855663 100644
--- a/sleekxmpp/plugins/xep_0202/stanza.py
+++ b/slixmpp/plugins/xep_0202/stanza.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
@@ -9,9 +9,9 @@
import logging
import datetime as dt
-from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.plugins import xep_0082
-from sleekxmpp.thirdparty import tzutc, tzoffset
+from slixmpp.xmlstream import ElementBase
+from slixmpp.plugins import xep_0082
+from slixmpp.thirdparty import tzutc, tzoffset
class EntityTime(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0202/time.py b/slixmpp/plugins/xep_0202/time.py
index d5b3af3..3b335e2 100644
--- a/sleekxmpp/plugins/xep_0202/time.py
+++ b/slixmpp/plugins/xep_0202/time.py
@@ -1,20 +1,20 @@
"""
- 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 logging
-from sleekxmpp.stanza.iq import Iq
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins import xep_0082
-from sleekxmpp.plugins.xep_0202 import stanza
+from slixmpp.stanza.iq import Iq
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins import xep_0082
+from slixmpp.plugins.xep_0202 import stanza
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0203/__init__.py b/slixmpp/plugins/xep_0203/__init__.py
new file mode 100644
index 0000000..59cb7af
--- /dev/null
+++ b/slixmpp/plugins/xep_0203/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0203 import stanza
+from slixmpp.plugins.xep_0203.stanza import Delay
+from slixmpp.plugins.xep_0203.delay import XEP_0203
+
+
+register_plugin(XEP_0203)
+
+# Retain some backwards compatibility
+xep_0203 = XEP_0203
diff --git a/sleekxmpp/plugins/xep_0203/delay.py b/slixmpp/plugins/xep_0203/delay.py
index 31f31ce..725003e 100644
--- a/sleekxmpp/plugins/xep_0203/delay.py
+++ b/slixmpp/plugins/xep_0203/delay.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.stanza import Message, Presence
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0203 import stanza
+from slixmpp.stanza import Message, Presence
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0203 import stanza
class XEP_0203(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0203/stanza.py b/slixmpp/plugins/xep_0203/stanza.py
index e147e97..de907c6 100644
--- a/sleekxmpp/plugins/xep_0203/stanza.py
+++ b/slixmpp/plugins/xep_0203/stanza.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import datetime as dt
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.plugins import xep_0082
+from slixmpp.jid import JID
+from slixmpp.xmlstream import ElementBase
+from slixmpp.plugins import xep_0082
class Delay(ElementBase):
diff --git a/slixmpp/plugins/xep_0221/__init__.py b/slixmpp/plugins/xep_0221/__init__.py
new file mode 100644
index 0000000..b977acc
--- /dev/null
+++ b/slixmpp/plugins/xep_0221/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0221 import stanza
+from slixmpp.plugins.xep_0221.stanza import Media, URI
+from slixmpp.plugins.xep_0221.media import XEP_0221
+
+
+register_plugin(XEP_0221)
diff --git a/sleekxmpp/plugins/xep_0221/media.py b/slixmpp/plugins/xep_0221/media.py
index c4b4a90..4c34fbd 100644
--- a/sleekxmpp/plugins/xep_0221/media.py
+++ b/slixmpp/plugins/xep_0221/media.py
@@ -1,17 +1,17 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0221 import stanza, Media, URI
-from sleekxmpp.plugins.xep_0004 import FormField
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0221 import stanza, Media, URI
+from slixmpp.plugins.xep_0004 import FormField
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0221/stanza.py b/slixmpp/plugins/xep_0221/stanza.py
index 915ab38..2a2bbab 100644
--- a/sleekxmpp/plugins/xep_0221/stanza.py
+++ b/slixmpp/plugins/xep_0221/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
+from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class Media(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0222.py b/slixmpp/plugins/xep_0222.py
index 2cc7f70..cadb133 100644
--- a/sleekxmpp/plugins/xep_0222.py
+++ b/slixmpp/plugins/xep_0222.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import BasePlugin, register_plugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.base import BasePlugin, register_plugin
log = logging.getLogger(__name__)
@@ -64,7 +64,7 @@ class XEP_0222(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -107,7 +107,7 @@ class XEP_0222(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/sleekxmpp/plugins/xep_0223.py b/slixmpp/plugins/xep_0223.py
index abbecfc..a22e6d4 100644
--- a/sleekxmpp/plugins/xep_0223.py
+++ b/slixmpp/plugins/xep_0223.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import BasePlugin, register_plugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.base import BasePlugin, register_plugin
log = logging.getLogger(__name__)
@@ -64,7 +64,7 @@ class XEP_0223(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
@@ -107,7 +107,7 @@ class XEP_0223(BasePlugin):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
"""
diff --git a/slixmpp/plugins/xep_0224/__init__.py b/slixmpp/plugins/xep_0224/__init__.py
new file mode 100644
index 0000000..4fadfd7
--- /dev/null
+++ b/slixmpp/plugins/xep_0224/__init__.py
@@ -0,0 +1,20 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0224 import stanza
+from slixmpp.plugins.xep_0224.stanza import Attention
+from slixmpp.plugins.xep_0224.attention import XEP_0224
+
+
+register_plugin(XEP_0224)
+
+
+# Retain some backwards compatibility
+xep_0224 = XEP_0224
diff --git a/sleekxmpp/plugins/xep_0224/attention.py b/slixmpp/plugins/xep_0224/attention.py
index 4e56060..2777e1b 100644
--- a/sleekxmpp/plugins/xep_0224/attention.py
+++ b/slixmpp/plugins/xep_0224/attention.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp.stanza import Message
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0224 import stanza
+from slixmpp.stanza import Message
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0224 import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0224/stanza.py b/slixmpp/plugins/xep_0224/stanza.py
index f15172d..2b77dad 100644
--- a/sleekxmpp/plugins/xep_0224/stanza.py
+++ b/slixmpp/plugins/xep_0224/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class Attention(ElementBase):
diff --git a/slixmpp/plugins/xep_0231/__init__.py b/slixmpp/plugins/xep_0231/__init__.py
new file mode 100644
index 0000000..57d5784
--- /dev/null
+++ b/slixmpp/plugins/xep_0231/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz,
+ Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0231.stanza import BitsOfBinary
+from slixmpp.plugins.xep_0231.bob import XEP_0231
+
+
+register_plugin(XEP_0231)
diff --git a/sleekxmpp/plugins/xep_0231/bob.py b/slixmpp/plugins/xep_0231/bob.py
index 5e1f590..d590c9d 100644
--- a/sleekxmpp/plugins/xep_0231/bob.py
+++ b/slixmpp/plugins/xep_0231/bob.py
@@ -1,8 +1,8 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz,
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -10,13 +10,13 @@
import logging
import hashlib
-from sleekxmpp.stanza import Iq, Message, Presence
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0231 import stanza, BitsOfBinary
+from slixmpp.stanza import Iq, Message, Presence
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0231 import stanza, BitsOfBinary
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0231/stanza.py b/slixmpp/plugins/xep_0231/stanza.py
index 8bf0d6e..f7e6a66 100644
--- a/sleekxmpp/plugins/xep_0231/stanza.py
+++ b/slixmpp/plugins/xep_0231/stanza.py
@@ -1,8 +1,8 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz,
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -10,8 +10,8 @@
import base64
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.util import bytes
+from slixmpp.xmlstream import ElementBase
class BitsOfBinary(ElementBase):
diff --git a/slixmpp/plugins/xep_0235/__init__.py b/slixmpp/plugins/xep_0235/__init__.py
new file mode 100644
index 0000000..8810a84
--- /dev/null
+++ b/slixmpp/plugins/xep_0235/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0235 import stanza
+from slixmpp.plugins.xep_0235.stanza import OAuth
+from slixmpp.plugins.xep_0235.oauth import XEP_0235
+
+
+register_plugin(XEP_0235)
diff --git a/sleekxmpp/plugins/xep_0235/oauth.py b/slixmpp/plugins/xep_0235/oauth.py
index df0e2eb..bcd220b 100644
--- a/sleekxmpp/plugins/xep_0235/oauth.py
+++ b/slixmpp/plugins/xep_0235/oauth.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,10 +9,10 @@
import logging
-from sleekxmpp import Message
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0235 import stanza, OAuth
+from slixmpp import Message
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0235 import stanza, OAuth
class XEP_0235(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0235/stanza.py b/slixmpp/plugins/xep_0235/stanza.py
index 0050d58..abb4a38 100644
--- a/sleekxmpp/plugins/xep_0235/stanza.py
+++ b/slixmpp/plugins/xep_0235/stanza.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -11,7 +11,7 @@ import hashlib
import urllib
import base64
-from sleekxmpp.xmlstream import ET, ElementBase, JID
+from slixmpp.xmlstream import ET, ElementBase, JID
class OAuth(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0242.py b/slixmpp/plugins/xep_0242.py
index c1bada2..ea077a7 100644
--- a/sleekxmpp/plugins/xep_0242.py
+++ b/slixmpp/plugins/xep_0242.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins import BasePlugin, register_plugin
+from slixmpp.plugins import BasePlugin, register_plugin
class XEP_0242(BasePlugin):
diff --git a/slixmpp/plugins/xep_0249/__init__.py b/slixmpp/plugins/xep_0249/__init__.py
new file mode 100644
index 0000000..5d120ec
--- /dev/null
+++ b/slixmpp/plugins/xep_0249/__init__.py
@@ -0,0 +1,19 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2011 Nathanael C. Fritz, Dalek
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0249.stanza import Invite
+from slixmpp.plugins.xep_0249.invite import XEP_0249
+
+
+register_plugin(XEP_0249)
+
+
+# Retain some backwards compatibility
+xep_0249 = XEP_0249
diff --git a/sleekxmpp/plugins/xep_0249/invite.py b/slixmpp/plugins/xep_0249/invite.py
index 4b7abd4..fe5f588 100644
--- a/sleekxmpp/plugins/xep_0249/invite.py
+++ b/slixmpp/plugins/xep_0249/invite.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Dalek
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-import sleekxmpp
-from sleekxmpp import Message
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.xep_0249 import Invite, stanza
+import slixmpp
+from slixmpp import Message
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.xep_0249 import Invite, stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0249/stanza.py b/slixmpp/plugins/xep_0249/stanza.py
index ba4060d..5979f09 100644
--- a/sleekxmpp/plugins/xep_0249/stanza.py
+++ b/slixmpp/plugins/xep_0249/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2011 Nathanael C. Fritz, Dalek
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class Invite(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0256.py b/slixmpp/plugins/xep_0256.py
index 0db8ea3..4ad4f0e 100644
--- a/sleekxmpp/plugins/xep_0256.py
+++ b/slixmpp/plugins/xep_0256.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Presence
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.plugins import BasePlugin, register_plugin
-from sleekxmpp.xmlstream import register_stanza_plugin
+from slixmpp import Presence
+from slixmpp.exceptions import XMPPError
+from slixmpp.plugins import BasePlugin, register_plugin
+from slixmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0012 import stanza, LastActivity
+from slixmpp.plugins.xep_0012 import stanza, LastActivity
log = logging.getLogger(__name__)
diff --git a/slixmpp/plugins/xep_0257/__init__.py b/slixmpp/plugins/xep_0257/__init__.py
new file mode 100644
index 0000000..2621ad8
--- /dev/null
+++ b/slixmpp/plugins/xep_0257/__init__.py
@@ -0,0 +1,17 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0257 import stanza
+from slixmpp.plugins.xep_0257.stanza import Certs, AppendCert
+from slixmpp.plugins.xep_0257.stanza import DisableCert, RevokeCert
+from slixmpp.plugins.xep_0257.client_cert_management import XEP_0257
+
+
+register_plugin(XEP_0257)
diff --git a/sleekxmpp/plugins/xep_0257/client_cert_management.py b/slixmpp/plugins/xep_0257/client_cert_management.py
index 4931784..0d03eb1 100644
--- a/sleekxmpp/plugins/xep_0257/client_cert_management.py
+++ b/slixmpp/plugins/xep_0257/client_cert_management.py
@@ -1,18 +1,18 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0257 import stanza, Certs
-from sleekxmpp.plugins.xep_0257 import AppendCert, DisableCert, RevokeCert
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0257 import stanza, Certs
+from slixmpp.plugins.xep_0257 import AppendCert, DisableCert, RevokeCert
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0257/stanza.py b/slixmpp/plugins/xep_0257/stanza.py
index 17e2013..7c2da74 100644
--- a/sleekxmpp/plugins/xep_0257/stanza.py
+++ b/slixmpp/plugins/xep_0257/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
class Certs(ElementBase):
diff --git a/slixmpp/plugins/xep_0258/__init__.py b/slixmpp/plugins/xep_0258/__init__.py
new file mode 100644
index 0000000..7210072
--- /dev/null
+++ b/slixmpp/plugins/xep_0258/__init__.py
@@ -0,0 +1,18 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0258 import stanza
+from slixmpp.plugins.xep_0258.stanza import SecurityLabel, Label
+from slixmpp.plugins.xep_0258.stanza import DisplayMarking, EquivalentLabel
+from slixmpp.plugins.xep_0258.stanza import ESSLabel, Catalog, CatalogItem
+from slixmpp.plugins.xep_0258.security_labels import XEP_0258
+
+
+register_plugin(XEP_0258)
diff --git a/sleekxmpp/plugins/xep_0258/security_labels.py b/slixmpp/plugins/xep_0258/security_labels.py
index 439143c..07783b4 100644
--- a/sleekxmpp/plugins/xep_0258/security_labels.py
+++ b/slixmpp/plugins/xep_0258/security_labels.py
@@ -1,17 +1,17 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import logging
-from sleekxmpp import Iq, Message
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0258 import stanza, SecurityLabel, Catalog
+from slixmpp import Iq, Message
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0258 import stanza, SecurityLabel, Catalog
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0258/stanza.py b/slixmpp/plugins/xep_0258/stanza.py
index a506064..e47bd34 100644
--- a/sleekxmpp/plugins/xep_0258/stanza.py
+++ b/slixmpp/plugins/xep_0258/stanza.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
from base64 import b64encode, b64decode
-from sleekxmpp.util import bytes
-from sleekxmpp.xmlstream import ElementBase, ET, register_stanza_plugin
+from slixmpp.util import bytes
+from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
class SecurityLabel(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0270.py b/slixmpp/plugins/xep_0270.py
index eadd45a..4d02a0a 100644
--- a/sleekxmpp/plugins/xep_0270.py
+++ b/slixmpp/plugins/xep_0270.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins import BasePlugin, register_plugin
+from slixmpp.plugins import BasePlugin, register_plugin
class XEP_0270(BasePlugin):
diff --git a/slixmpp/plugins/xep_0279/__init__.py b/slixmpp/plugins/xep_0279/__init__.py
new file mode 100644
index 0000000..45fd3af
--- /dev/null
+++ b/slixmpp/plugins/xep_0279/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0279 import stanza
+from slixmpp.plugins.xep_0279.stanza import IPCheck
+from slixmpp.plugins.xep_0279.ipcheck import XEP_0279
+
+
+register_plugin(XEP_0279)
diff --git a/sleekxmpp/plugins/xep_0279/ipcheck.py b/slixmpp/plugins/xep_0279/ipcheck.py
index f8c167c..b0c0a6c 100644
--- a/sleekxmpp/plugins/xep_0279/ipcheck.py
+++ b/slixmpp/plugins/xep_0279/ipcheck.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,10 +9,10 @@
import logging
-from sleekxmpp import Iq
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0279 import stanza, IPCheck
+from slixmpp import Iq
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0279 import stanza, IPCheck
class XEP_0279(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0279/stanza.py b/slixmpp/plugins/xep_0279/stanza.py
index 181b595..f80623c 100644
--- a/sleekxmpp/plugins/xep_0279/stanza.py
+++ b/slixmpp/plugins/xep_0279/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class IPCheck(ElementBase):
diff --git a/slixmpp/plugins/xep_0280/__init__.py b/slixmpp/plugins/xep_0280/__init__.py
new file mode 100644
index 0000000..ed9a19e
--- /dev/null
+++ b/slixmpp/plugins/xep_0280/__init__.py
@@ -0,0 +1,17 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permissio
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0280.stanza import ReceivedCarbon, SentCarbon
+from slixmpp.plugins.xep_0280.stanza import PrivateCarbon
+from slixmpp.plugins.xep_0280.stanza import CarbonEnable, CarbonDisable
+from slixmpp.plugins.xep_0280.carbons import XEP_0280
+
+
+register_plugin(XEP_0280)
diff --git a/sleekxmpp/plugins/xep_0280/carbons.py b/slixmpp/plugins/xep_0280/carbons.py
index 482d046..15b0722 100644
--- a/sleekxmpp/plugins/xep_0280/carbons.py
+++ b/slixmpp/plugins/xep_0280/carbons.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
import logging
-import sleekxmpp
-from sleekxmpp.stanza import Message, 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.xep_0280 import stanza
+import slixmpp
+from slixmpp.stanza import Message, Iq
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0280 import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0280/stanza.py b/slixmpp/plugins/xep_0280/stanza.py
index 2f3aad8..4627618 100644
--- a/sleekxmpp/plugins/xep_0280/stanza.py
+++ b/slixmpp/plugins/xep_0280/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class ReceivedCarbon(ElementBase):
diff --git a/slixmpp/plugins/xep_0297/__init__.py b/slixmpp/plugins/xep_0297/__init__.py
new file mode 100644
index 0000000..8d7adb6
--- /dev/null
+++ b/slixmpp/plugins/xep_0297/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0297 import stanza
+from slixmpp.plugins.xep_0297.stanza import Forwarded
+from slixmpp.plugins.xep_0297.forwarded import XEP_0297
+
+
+register_plugin(XEP_0297)
diff --git a/sleekxmpp/plugins/xep_0297/forwarded.py b/slixmpp/plugins/xep_0297/forwarded.py
index 95703a2..7c40bf3 100644
--- a/sleekxmpp/plugins/xep_0297/forwarded.py
+++ b/slixmpp/plugins/xep_0297/forwarded.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,12 +9,12 @@
import logging
-from sleekxmpp import Iq, Message, Presence
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.xep_0297 import stanza, Forwarded
+from slixmpp import Iq, Message, Presence
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.xep_0297 import stanza, Forwarded
class XEP_0297(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0297/stanza.py b/slixmpp/plugins/xep_0297/stanza.py
index 8b97acc..233ad4f 100644
--- a/sleekxmpp/plugins/xep_0297/stanza.py
+++ b/slixmpp/plugins/xep_0297/stanza.py
@@ -1,13 +1,13 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.stanza import Message, Presence, Iq
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.stanza import Message, Presence, Iq
+from slixmpp.xmlstream import ElementBase
class Forwarded(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0302.py b/slixmpp/plugins/xep_0302.py
index dee60f9..6092b3e 100644
--- a/sleekxmpp/plugins/xep_0302.py
+++ b/slixmpp/plugins/xep_0302.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins import BasePlugin, register_plugin
+from slixmpp.plugins import BasePlugin, register_plugin
class XEP_0302(BasePlugin):
diff --git a/slixmpp/plugins/xep_0308/__init__.py b/slixmpp/plugins/xep_0308/__init__.py
new file mode 100644
index 0000000..147cbd4
--- /dev/null
+++ b/slixmpp/plugins/xep_0308/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permissio
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0308.stanza import Replace
+from slixmpp.plugins.xep_0308.correction import XEP_0308
+
+
+register_plugin(XEP_0308)
diff --git a/sleekxmpp/plugins/xep_0308/correction.py b/slixmpp/plugins/xep_0308/correction.py
index d32b4bc..3802b79 100644
--- a/sleekxmpp/plugins/xep_0308/correction.py
+++ b/slixmpp/plugins/xep_0308/correction.py
@@ -1,20 +1,20 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
import logging
-import sleekxmpp
-from sleekxmpp.stanza import 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.xep_0308 import stanza, Replace
+import slixmpp
+from slixmpp.stanza import Message
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0308 import stanza, Replace
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0308/stanza.py b/slixmpp/plugins/xep_0308/stanza.py
index 8f88cbc..eb04d1a 100644
--- a/sleekxmpp/plugins/xep_0308/stanza.py
+++ b/slixmpp/plugins/xep_0308/stanza.py
@@ -1,12 +1,12 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class Replace(ElementBase):
diff --git a/slixmpp/plugins/xep_0313/__init__.py b/slixmpp/plugins/xep_0313/__init__.py
new file mode 100644
index 0000000..42d9025
--- /dev/null
+++ b/slixmpp/plugins/xep_0313/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permissio
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0313.stanza import Result, MAM, Preferences
+from slixmpp.plugins.xep_0313.mam import XEP_0313
+
+
+register_plugin(XEP_0313)
diff --git a/sleekxmpp/plugins/xep_0313/mam.py b/slixmpp/plugins/xep_0313/mam.py
index 4b82ca0..eafbfcf 100644
--- a/sleekxmpp/plugins/xep_0313/mam.py
+++ b/slixmpp/plugins/xep_0313/mam.py
@@ -1,21 +1,21 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
import logging
-import sleekxmpp
-from sleekxmpp.stanza import Message, Iq
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.xmlstream.handler import Collector
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.plugins.xep_0313 import stanza
+import slixmpp
+from slixmpp.stanza import Message, Iq
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream.handler import Collector
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins import BasePlugin
+from slixmpp.plugins.xep_0313 import stanza
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0313/stanza.py b/slixmpp/plugins/xep_0313/stanza.py
index 81576cd..d7cfa22 100644
--- a/sleekxmpp/plugins/xep_0313/stanza.py
+++ b/slixmpp/plugins/xep_0313/stanza.py
@@ -1,16 +1,16 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permissio
"""
import datetime as dt
-from sleekxmpp.jid import JID
-from sleekxmpp.xmlstream import ElementBase, ET
-from sleekxmpp.plugins import xep_0082
+from slixmpp.jid import JID
+from slixmpp.xmlstream import ElementBase, ET
+from slixmpp.plugins import xep_0082
class MAM(ElementBase):
diff --git a/slixmpp/plugins/xep_0319/__init__.py b/slixmpp/plugins/xep_0319/__init__.py
new file mode 100644
index 0000000..a9253b4
--- /dev/null
+++ b/slixmpp/plugins/xep_0319/__init__.py
@@ -0,0 +1,16 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.plugins.base import register_plugin
+
+from slixmpp.plugins.xep_0319 import stanza
+from slixmpp.plugins.xep_0319.stanza import Idle
+from slixmpp.plugins.xep_0319.idle import XEP_0319
+
+
+register_plugin(XEP_0319)
diff --git a/sleekxmpp/plugins/xep_0319/idle.py b/slixmpp/plugins/xep_0319/idle.py
index 90456f9..1fd980a 100644
--- a/sleekxmpp/plugins/xep_0319/idle.py
+++ b/slixmpp/plugins/xep_0319/idle.py
@@ -1,19 +1,19 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
from datetime import datetime, timedelta
-from sleekxmpp.stanza import Presence
-from sleekxmpp.plugins import BasePlugin
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.xep_0319 import stanza
+from slixmpp.stanza import Presence
+from slixmpp.plugins import BasePlugin
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.xep_0319 import stanza
class XEP_0319(BasePlugin):
diff --git a/sleekxmpp/plugins/xep_0319/stanza.py b/slixmpp/plugins/xep_0319/stanza.py
index abfb4f4..ea70087 100644
--- a/sleekxmpp/plugins/xep_0319/stanza.py
+++ b/slixmpp/plugins/xep_0319/stanza.py
@@ -1,15 +1,15 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import datetime as dt
-from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.plugins import xep_0082
+from slixmpp.xmlstream import ElementBase
+from slixmpp.plugins import xep_0082
class Idle(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0323/__init__.py b/slixmpp/plugins/xep_0323/__init__.py
index 10779ad..6bf42fd 100644
--- a/sleekxmpp/plugins/xep_0323/__init__.py
+++ b/slixmpp/plugins/xep_0323/__init__.py
@@ -1,17 +1,17 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins.base import register_plugin
+from slixmpp.plugins.base import register_plugin
-from sleekxmpp.plugins.xep_0323.sensordata import XEP_0323
-from sleekxmpp.plugins.xep_0323 import stanza
+from slixmpp.plugins.xep_0323.sensordata import XEP_0323
+from slixmpp.plugins.xep_0323 import stanza
register_plugin(XEP_0323)
diff --git a/sleekxmpp/plugins/xep_0323/device.py b/slixmpp/plugins/xep_0323/device.py
index 0bc2032..a3bd95d 100644
--- a/sleekxmpp/plugins/xep_0323/device.py
+++ b/slixmpp/plugins/xep_0323/device.py
@@ -1,9 +1,9 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
diff --git a/sleekxmpp/plugins/xep_0323/sensordata.py b/slixmpp/plugins/xep_0323/sensordata.py
index 2e2f247..afb694d 100644
--- a/sleekxmpp/plugins/xep_0323/sensordata.py
+++ b/slixmpp/plugins/xep_0323/sensordata.py
@@ -1,9 +1,9 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -13,14 +13,14 @@ import time
import datetime
from threading import Thread, Lock, Timer
-from sleekxmpp.plugins.xep_0323.timerreset import TimerReset
+from slixmpp.plugins.xep_0323.timerreset import TimerReset
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0323 import stanza
-from sleekxmpp.plugins.xep_0323.stanza import Sensordata
+from slixmpp.xmlstream import JID
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0323 import stanza
+from slixmpp.plugins.xep_0323.stanza import Sensordata
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0325/stanza/__init__.py b/slixmpp/plugins/xep_0323/stanza/__init__.py
index 746c203..e1603e4 100644
--- a/sleekxmpp/plugins/xep_0325/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0323/stanza/__init__.py
@@ -1,12 +1,12 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins.xep_0325.stanza.control import *
+from slixmpp.plugins.xep_0323.stanza.sensordata import *
diff --git a/sleekxmpp/plugins/xep_0325/stanza/base.py b/slixmpp/plugins/xep_0323/stanza/base.py
index 1dadcf4..7959b81 100644
--- a/sleekxmpp/plugins/xep_0325/stanza/base.py
+++ b/slixmpp/plugins/xep_0323/stanza/base.py
@@ -1,13 +1,13 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ET
+from slixmpp.xmlstream import ET
pass
diff --git a/sleekxmpp/plugins/xep_0323/stanza/sensordata.py b/slixmpp/plugins/xep_0323/stanza/sensordata.py
index a11c3e9..9294649 100644
--- a/sleekxmpp/plugins/xep_0323/stanza/sensordata.py
+++ b/slixmpp/plugins/xep_0323/stanza/sensordata.py
@@ -1,15 +1,15 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp import Iq, Message
-from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
+from slixmpp import Iq, Message
+from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
from re import match
class Sensordata(ElementBase):
diff --git a/sleekxmpp/plugins/xep_0323/timerreset.py b/slixmpp/plugins/xep_0323/timerreset.py
index 578f1ef..baa80d4 100644
--- a/sleekxmpp/plugins/xep_0323/timerreset.py
+++ b/slixmpp/plugins/xep_0323/timerreset.py
@@ -1,9 +1,9 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
diff --git a/sleekxmpp/plugins/xep_0325/__init__.py b/slixmpp/plugins/xep_0325/__init__.py
index 01c38dc..ce8cb7c 100644
--- a/sleekxmpp/plugins/xep_0325/__init__.py
+++ b/slixmpp/plugins/xep_0325/__init__.py
@@ -1,17 +1,17 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins.base import register_plugin
+from slixmpp.plugins.base import register_plugin
-from sleekxmpp.plugins.xep_0325.control import XEP_0325
-from sleekxmpp.plugins.xep_0325 import stanza
+from slixmpp.plugins.xep_0325.control import XEP_0325
+from slixmpp.plugins.xep_0325 import stanza
register_plugin(XEP_0325)
diff --git a/sleekxmpp/plugins/xep_0325/control.py b/slixmpp/plugins/xep_0325/control.py
index e34eb2c..b1910c5 100644
--- a/sleekxmpp/plugins/xep_0325/control.py
+++ b/slixmpp/plugins/xep_0325/control.py
@@ -1,9 +1,9 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -12,12 +12,12 @@ import logging
import time
from threading import Thread, Timer, Lock
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.xmlstream.handler import Callback
-from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.plugins.base import BasePlugin
-from sleekxmpp.plugins.xep_0325 import stanza
-from sleekxmpp.plugins.xep_0325.stanza import Control
+from slixmpp.xmlstream import JID
+from slixmpp.xmlstream.handler import Callback
+from slixmpp.xmlstream.matcher import StanzaPath
+from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0325 import stanza
+from slixmpp.plugins.xep_0325.stanza import Control
log = logging.getLogger(__name__)
diff --git a/sleekxmpp/plugins/xep_0325/device.py b/slixmpp/plugins/xep_0325/device.py
index a60d5f9..26ebc89 100644
--- a/sleekxmpp/plugins/xep_0325/device.py
+++ b/slixmpp/plugins/xep_0325/device.py
@@ -1,9 +1,9 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
diff --git a/sleekxmpp/plugins/xep_0323/stanza/__init__.py b/slixmpp/plugins/xep_0325/stanza/__init__.py
index c039cef..1466db5 100644
--- a/sleekxmpp/plugins/xep_0323/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0325/stanza/__init__.py
@@ -1,12 +1,12 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.plugins.xep_0323.stanza.sensordata import *
+from slixmpp.plugins.xep_0325.stanza.control import *
diff --git a/sleekxmpp/plugins/xep_0323/stanza/base.py b/slixmpp/plugins/xep_0325/stanza/base.py
index 1dadcf4..7959b81 100644
--- a/sleekxmpp/plugins/xep_0323/stanza/base.py
+++ b/slixmpp/plugins/xep_0325/stanza/base.py
@@ -1,13 +1,13 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp.xmlstream import ET
+from slixmpp.xmlstream import ET
pass
diff --git a/sleekxmpp/plugins/xep_0325/stanza/control.py b/slixmpp/plugins/xep_0325/stanza/control.py
index 67107ec..d3d6a25 100644
--- a/sleekxmpp/plugins/xep_0325/stanza/control.py
+++ b/slixmpp/plugins/xep_0325/stanza/control.py
@@ -1,15 +1,15 @@
"""
- 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, bjorn.westrom@consoden.se
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
-from sleekxmpp import Iq, Message
-from sleekxmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
+from slixmpp import Iq, Message
+from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
from re import match
class Control(ElementBase):
diff --git a/slixmpp/roster/__init__.py b/slixmpp/roster/__init__.py
new file mode 100644
index 0000000..9a9b69a
--- /dev/null
+++ b/slixmpp/roster/__init__.py
@@ -0,0 +1,11 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.roster.item import RosterItem
+from slixmpp.roster.single import RosterNode
+from slixmpp.roster.multi import Roster
diff --git a/sleekxmpp/roster/item.py b/slixmpp/roster/item.py
index ae194e0..c1eb574 100644
--- a/sleekxmpp/roster/item.py
+++ b/slixmpp/roster/item.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
@@ -71,7 +71,7 @@ class RosterItem(object):
groups -- A list of group names for the JID.
Attributes:
- xmpp -- The main SleekXMPP instance.
+ xmpp -- The main Slixmpp instance.
owner -- The JID that owns the roster.
jid -- The JID for the roster item.
db -- Optional datastore interface object.
@@ -110,7 +110,7 @@ class RosterItem(object):
Create a new roster item.
Arguments:
- xmpp -- The main SleekXMPP instance.
+ xmpp -- The main Slixmpp instance.
jid -- The item's JID.
owner -- The roster owner's JID. Defaults
so self.xmpp.boundjid.bare.
diff --git a/sleekxmpp/roster/multi.py b/slixmpp/roster/multi.py
index 5d070ec..e1a44a0 100644
--- a/sleekxmpp/roster/multi.py
+++ b/slixmpp/roster/multi.py
@@ -1,20 +1,20 @@
"""
- 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.
"""
-from sleekxmpp.stanza import Presence
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.roster import RosterNode
+from slixmpp.stanza import Presence
+from slixmpp.xmlstream import JID
+from slixmpp.roster import RosterNode
class Roster(object):
"""
- SleekXMPP's roster manager.
+ Slixmpp's roster manager.
The roster is divided into "nodes", where each node is responsible
for a single JID. While the distinction is not strictly necessary
@@ -27,7 +27,7 @@ class Roster(object):
methods that the datastore interface object must provide.
Attributes:
- xmpp -- The main SleekXMPP instance.
+ xmpp -- The main Slixmpp instance.
db -- Optional interface object to an external datastore.
auto_authorize -- Default auto_authorize value for new roster nodes.
Defaults to True.
@@ -44,7 +44,7 @@ class Roster(object):
Create a new roster.
Arguments:
- xmpp -- The main SleekXMPP instance.
+ xmpp -- The main Slixmpp instance.
db -- Optional interface object to a datastore.
"""
self.xmpp = xmpp
diff --git a/sleekxmpp/roster/single.py b/slixmpp/roster/single.py
index f080ae8..07a1f18 100644
--- a/sleekxmpp/roster/single.py
+++ b/slixmpp/roster/single.py
@@ -1,15 +1,15 @@
"""
- 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 threading
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.roster import RosterItem
+from slixmpp.xmlstream import JID
+from slixmpp.roster import RosterItem
class RosterNode(object):
@@ -18,7 +18,7 @@ class RosterNode(object):
A roster node is a roster for a single JID.
Attributes:
- xmpp -- The main SleekXMPP instance.
+ xmpp -- The main Slixmpp instance.
jid -- The JID that owns the roster node.
db -- Optional interface to an external datastore.
auto_authorize -- Determines how authorizations are handled:
@@ -49,7 +49,7 @@ class RosterNode(object):
Create a roster node for a JID.
Arguments:
- xmpp -- The main SleekXMPP instance.
+ xmpp -- The main Slixmpp instance.
jid -- The JID that owns the roster.
db -- Optional interface to an external datastore.
"""
diff --git a/slixmpp/stanza/__init__.py b/slixmpp/stanza/__init__.py
new file mode 100644
index 0000000..6cd6a2c
--- /dev/null
+++ b/slixmpp/stanza/__init__.py
@@ -0,0 +1,15 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+
+from slixmpp.stanza.error import Error
+from slixmpp.stanza.iq import Iq
+from slixmpp.stanza.message import Message
+from slixmpp.stanza.presence import Presence
+from slixmpp.stanza.stream_features import StreamFeatures
+from slixmpp.stanza.stream_error import StreamError
diff --git a/sleekxmpp/stanza/atom.py b/slixmpp/stanza/atom.py
index 244ef31..2c10568 100644
--- a/sleekxmpp/stanza/atom.py
+++ b/slixmpp/stanza/atom.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase
+from slixmpp.xmlstream import ElementBase
class AtomEntry(ElementBase):
diff --git a/sleekxmpp/stanza/error.py b/slixmpp/stanza/error.py
index 56558ba..efdcda0 100644
--- a/sleekxmpp/stanza/error.py
+++ b/slixmpp/stanza/error.py
@@ -1,12 +1,12 @@
"""
- 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.
"""
-from sleekxmpp.xmlstream import ElementBase, ET
+from slixmpp.xmlstream import ElementBase, ET
class Error(ElementBase):
diff --git a/sleekxmpp/stanza/htmlim.py b/slixmpp/stanza/htmlim.py
index c43178f..a2842a3 100644
--- a/sleekxmpp/stanza/htmlim.py
+++ b/slixmpp/stanza/htmlim.py
@@ -1,14 +1,14 @@
"""
- 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.
"""
-from sleekxmpp.stanza import Message
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0071 import XHTML_IM as HTMLIM
+from slixmpp.stanza import Message
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0071 import XHTML_IM as HTMLIM
register_stanza_plugin(Message, HTMLIM)
diff --git a/sleekxmpp/stanza/iq.py b/slixmpp/stanza/iq.py
index 088de4c..4be819b 100644
--- a/sleekxmpp/stanza/iq.py
+++ b/slixmpp/stanza/iq.py
@@ -1,16 +1,16 @@
"""
- 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.
"""
-from sleekxmpp.stanza.rootstanza import RootStanza
-from sleekxmpp.xmlstream import StanzaBase, ET
-from sleekxmpp.xmlstream.handler import Waiter, Callback
-from sleekxmpp.xmlstream.matcher import MatchIDSender, MatcherId
-from sleekxmpp.exceptions import IqTimeout, IqError
+from slixmpp.stanza.rootstanza import RootStanza
+from slixmpp.xmlstream import StanzaBase, ET
+from slixmpp.xmlstream.handler import Waiter, Callback
+from slixmpp.xmlstream.matcher import MatchIDSender, MatcherId
+from slixmpp.exceptions import IqTimeout, IqError
class Iq(RootStanza):
@@ -179,7 +179,7 @@ class Iq(RootStanza):
is received, or a timeout occurs. Defaults to True.
timeout -- The length of time (in seconds) to wait for a response
before exiting the send call if blocking is used.
- Defaults to sleekxmpp.xmlstream.RESPONSE_TIMEOUT
+ Defaults to slixmpp.xmlstream.RESPONSE_TIMEOUT
callback -- Optional reference to a stream handler function. Will
be executed when a reply stanza is received.
now -- Indicates if the send queue should be skipped and send
diff --git a/sleekxmpp/stanza/message.py b/slixmpp/stanza/message.py
index 0bb6e58..9495a62 100644
--- a/sleekxmpp/stanza/message.py
+++ b/slixmpp/stanza/message.py
@@ -1,13 +1,13 @@
"""
- 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.
"""
-from sleekxmpp.stanza.rootstanza import RootStanza
-from sleekxmpp.xmlstream import StanzaBase, ET
+from slixmpp.stanza.rootstanza import RootStanza
+from slixmpp.xmlstream import StanzaBase, ET
class Message(RootStanza):
diff --git a/sleekxmpp/stanza/nick.py b/slixmpp/stanza/nick.py
index 0e9a5c2..bc7bf5e 100644
--- a/sleekxmpp/stanza/nick.py
+++ b/slixmpp/stanza/nick.py
@@ -1,7 +1,7 @@
"""
- 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.
"""
@@ -9,9 +9,9 @@
# The nickname stanza has been moved to its own plugin, but the existing
# references are kept for backwards compatibility.
-from sleekxmpp.stanza import Message, Presence
-from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins.xep_0172 import UserNick as Nick
+from slixmpp.stanza import Message, Presence
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.plugins.xep_0172 import UserNick as Nick
register_stanza_plugin(Message, Nick)
register_stanza_plugin(Presence, Nick)
diff --git a/sleekxmpp/stanza/presence.py b/slixmpp/stanza/presence.py
index 84bcd12..3da20b7 100644
--- a/sleekxmpp/stanza/presence.py
+++ b/slixmpp/stanza/presence.py
@@ -1,13 +1,13 @@
"""
- 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.
"""
-from sleekxmpp.stanza.rootstanza import RootStanza
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.stanza.rootstanza import RootStanza
+from slixmpp.xmlstream import StanzaBase
class Presence(RootStanza):
diff --git a/sleekxmpp/stanza/rootstanza.py b/slixmpp/stanza/rootstanza.py
index a7c2b21..7bd0c32 100644
--- a/sleekxmpp/stanza/rootstanza.py
+++ b/slixmpp/stanza/rootstanza.py
@@ -1,16 +1,16 @@
"""
- 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 logging
-from sleekxmpp.exceptions import XMPPError, IqError, IqTimeout
-from sleekxmpp.stanza import Error
-from sleekxmpp.xmlstream import ET, StanzaBase, register_stanza_plugin
+from slixmpp.exceptions import XMPPError, IqError, IqTimeout
+from slixmpp.stanza import Error
+from slixmpp.xmlstream import ET, StanzaBase, register_stanza_plugin
log = logging.getLogger(__name__)
@@ -74,7 +74,7 @@ class RootStanza(StanzaBase):
# We probably didn't raise this on purpose, so send an error stanza
self.reply()
self['error']['condition'] = 'undefined-condition'
- self['error']['text'] = "SleekXMPP got into trouble."
+ self['error']['text'] = "Slixmpp got into trouble."
self['error']['type'] = 'cancel'
self.send()
# log the error
diff --git a/sleekxmpp/stanza/roster.py b/slixmpp/stanza/roster.py
index 681efd4..0cf1142 100644
--- a/sleekxmpp/stanza/roster.py
+++ b/slixmpp/stanza/roster.py
@@ -1,14 +1,14 @@
"""
- 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.
"""
-from sleekxmpp.stanza import Iq
-from sleekxmpp.xmlstream import JID
-from sleekxmpp.xmlstream import ET, ElementBase, register_stanza_plugin
+from slixmpp.stanza import Iq
+from slixmpp.xmlstream import JID
+from slixmpp.xmlstream import ET, ElementBase, register_stanza_plugin
class Roster(ElementBase):
diff --git a/sleekxmpp/stanza/stream_error.py b/slixmpp/stanza/stream_error.py
index ed0078c..d8b8bb5 100644
--- a/sleekxmpp/stanza/stream_error.py
+++ b/slixmpp/stanza/stream_error.py
@@ -1,13 +1,13 @@
"""
- 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.
"""
-from sleekxmpp.stanza.error import Error
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.stanza.error import Error
+from slixmpp.xmlstream import StanzaBase
class StreamError(Error, StanzaBase):
diff --git a/sleekxmpp/stanza/stream_features.py b/slixmpp/stanza/stream_features.py
index e487721..4d46b97 100644
--- a/sleekxmpp/stanza/stream_features.py
+++ b/slixmpp/stanza/stream_features.py
@@ -1,13 +1,13 @@
"""
- 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.
"""
-from sleekxmpp.thirdparty import OrderedDict
-from sleekxmpp.xmlstream import StanzaBase
+from slixmpp.thirdparty import OrderedDict
+from slixmpp.xmlstream import StanzaBase
class StreamFeatures(StanzaBase):
diff --git a/slixmpp/test/__init__.py b/slixmpp/test/__init__.py
new file mode 100644
index 0000000..0804e4a
--- /dev/null
+++ b/slixmpp/test/__init__.py
@@ -0,0 +1,11 @@
+"""
+ Slixmpp: The Slick XMPP Library
+ Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+ This file is part of Slixmpp.
+
+ See the file LICENSE for copying permission.
+"""
+
+from slixmpp.test.mocksocket import TestSocket
+from slixmpp.test.livesocket import TestLiveSocket
+from slixmpp.test.slixtest import *
diff --git a/sleekxmpp/test/livesocket.py b/slixmpp/test/livesocket.py
index d70ee4e..0d18957 100644
--- a/sleekxmpp/test/livesocket.py
+++ b/slixmpp/test/livesocket.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,7 +9,7 @@
import socket
import threading
-from sleekxmpp.util import Queue
+from slixmpp.util import Queue
class TestLiveSocket(object):
diff --git a/sleekxmpp/test/mocksocket.py b/slixmpp/test/mocksocket.py
index 4c9d169..409b377 100644
--- a/sleekxmpp/test/mocksocket.py
+++ b/slixmpp/test/mocksocket.py
@@ -1,14 +1,14 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
import socket
-from sleekxmpp.util import Queue
+from slixmpp.util import Queue
class TestSocket(object):
diff --git a/sleekxmpp/test/sleektest.py b/slixmpp/test/slixtest.py
index d28f77e..5b00a2b 100644
--- a/sleekxmpp/test/sleektest.py
+++ b/slixmpp/test/slixtest.py
@@ -1,7 +1,7 @@
"""
- SleekXMPP: The Sleek XMPP Library
+ Slixmpp: The Slick XMPP Library
Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of SleekXMPP.
+ This file is part of Slixmpp.
See the file LICENSE for copying permission.
"""
@@ -9,21 +9,21 @@
import unittest
from xml.parsers.expat import ExpatError
-from sleekxmpp import ClientXMPP, ComponentXMPP
-from sleekxmpp.util import Queue
-from sleekxmpp.stanza import Message, Iq, Presence
-from sleekxmpp.test import TestSocket, TestLiveSocket
-from sleekxmpp.xmlstream import ET
-from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.xmlstream.tostring import tostring