-# Copyright 2005 James Bunton <james@delx.cjb.net>
+# Copyright 2005-2006 James Bunton <james@delx.cjb.net>
# Licensed for distribution under the GPL version 2, check COPYING for details
-from tlib.throttle import Throttler
-from tlib.xmlw import Element
+from throttle import Throttler
from twisted.internet import protocol
+from twisted.words.xish.domish import Element
import disco
import lang
# SOCKS5
-from tlib import socks5
+import socks5
import struct
class JEP65ConnectionSend(protocol.Protocol):
-# TODO, clean up and move this to tlib.socks5
+# TODO, clean up and move this to socks5
STATE_INITIAL = 1
STATE_WAIT_AUTHOK = 2
STATE_WAIT_CONNECTOK = 3