summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-10 14:15:58 -0700
committerLance Stout <lancestout@gmail.com>2012-06-10 14:15:58 -0700
commitf70b49882ffdfa23becc715a878d4ad41ca6f17e (patch)
treee471775f41a48e3e38455216d7cc3ed8d99c1232
parenta7b092a305ec180856dee34bb100969cf34222ef (diff)
downloadslixmpp-f70b49882ffdfa23becc715a878d4ad41ca6f17e.tar.gz
slixmpp-f70b49882ffdfa23becc715a878d4ad41ca6f17e.tar.bz2
slixmpp-f70b49882ffdfa23becc715a878d4ad41ca6f17e.tar.xz
slixmpp-f70b49882ffdfa23becc715a878d4ad41ca6f17e.zip
Fix XEP-0065 imports and naming for Python3.
-rw-r--r--sleekxmpp/plugins/__init__.py1
-rw-r--r--sleekxmpp/plugins/xep_0065/__init__.py4
-rw-r--r--sleekxmpp/plugins/xep_0065/proxy.py4
3 files changed, 5 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py
index 9ad3fbba..a4be9e65 100644
--- a/sleekxmpp/plugins/__init__.py
+++ b/sleekxmpp/plugins/__init__.py
@@ -27,6 +27,7 @@ __all__ = [
'xep_0054', # vcard-temp
'xep_0059', # Result Set Management
'xep_0060', # Pubsub (Client)
+ 'xep_0065', # SOCKS5 Bytestreams
'xep_0066', # Out of Band Data
'xep_0077', # In-Band Registration
# 'xep_0078', # Non-SASL auth. Don't automatically load
diff --git a/sleekxmpp/plugins/xep_0065/__init__.py b/sleekxmpp/plugins/xep_0065/__init__.py
index e1066005..c577d859 100644
--- a/sleekxmpp/plugins/xep_0065/__init__.py
+++ b/sleekxmpp/plugins/xep_0065/__init__.py
@@ -1,5 +1,5 @@
from sleekxmpp.plugins.base import register_plugin
-from sleekxmpp.plugins.xep_0065.proxy import xep_0065
+from sleekxmpp.plugins.xep_0065.proxy import XEP_0065
-register_plugin(xep_0065)
+register_plugin(XEP_0065)
diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/sleekxmpp/plugins/xep_0065/proxy.py
index 012175ac..b027e4e0 100644
--- a/sleekxmpp/plugins/xep_0065/proxy.py
+++ b/sleekxmpp/plugins/xep_0065/proxy.py
@@ -7,7 +7,7 @@ from hashlib import sha1
from select import select
from uuid import uuid4
-import stanza
+from sleekxmpp.plugins.xep_0065 import stanza
from sleekxmpp.plugins.base import base_plugin
from sleekxmpp.xmlstream.handler import Callback
@@ -18,7 +18,7 @@ from sleekxmpp.thirdparty.socks import socksocket, PROXY_TYPE_SOCKS5
log = logging.getLogger(__name__)
-class xep_0065(base_plugin):
+class XEP_0065(base_plugin):
"""
XEP-0065 Socks5 Bytestreams
"""