Recursively ignore *.pyc

[pymsnt] / src / ft.py

diff --git a/src/ft.py b/src/ft.py
index 756d3bfa16dd08979ffc4bc29c3b1f6b2a9291bf..78e5b054ebe448b847388a953fc01a5f09615c2b 100644 (file)
--- a/src/ft.py
+++ b/src/ft.py
@@ -1,9 +1,9 @@
-# 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
@@ -279,11 +279,11 @@ class FTReceive:
 
 # 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
@@ -300,6 +300,8 @@ class JEP65ConnectionSend(protocol.Protocol):
        def connectionLost(self, reason):
                if self.state == self.STATE_READY:
                        self.factory.consumer.close()
+               else:
+                       self.factory.consumer.error()
        
        def _waitAuthOk(self):
                ver, method = struct.unpack("!BB", self.buf[:2])