summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorSandro Munda <sandro.munda@guardis.com>2012-06-07 19:02:09 +0200
committerSandro Munda <sandro.munda@guardis.com>2012-06-07 19:02:09 +0200
commitdcdf5dcd098ee8033ca9036af7e2f6ab8ddba620 (patch)
treecb11b656facaeda1235831b2ef6bcb9133178e56 /sleekxmpp/plugins
parentc59a6d0f51112b1bc35f9d492342dea63bfce6e5 (diff)
downloadslixmpp-dcdf5dcd098ee8033ca9036af7e2f6ab8ddba620.tar.gz
slixmpp-dcdf5dcd098ee8033ca9036af7e2f6ab8ddba620.tar.bz2
slixmpp-dcdf5dcd098ee8033ca9036af7e2f6ab8ddba620.tar.xz
slixmpp-dcdf5dcd098ee8033ca9036af7e2f6ab8ddba620.zip
Added the Socksipy module in the thirdparty of SleekXMPP.
Updated the LICENSE file with the license of the Socksipy module (New-BSD).
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0065/proxy.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/sleekxmpp/plugins/xep_0065/proxy.py
index 89f37399..f7b259f2 100644
--- a/sleekxmpp/plugins/xep_0065/proxy.py
+++ b/sleekxmpp/plugins/xep_0065/proxy.py
@@ -7,12 +7,12 @@ from hashlib import sha1
from select import select
from uuid import uuid4
+import stanza
+
from sleekxmpp.plugins.base import base_plugin
from sleekxmpp.xmlstream.handler import Callback
from sleekxmpp.xmlstream.matcher import StanzaPath
-from socks import socksocket, PROXY_TYPE_SOCKS5
-
-import stanza
+from sleekxmpp.thirdparty.socks import socksocket, PROXY_TYPE_SOCKS5
# Registers the sleekxmpp logger
log = logging.getLogger(__name__)