diff -r 85c86a67fc4b -r adf2553cf11d Kamaelia/Internet/TCPClient.py
--- a/Kamaelia/Internet/TCPClient.py	Sun Mar 15 16:32:27 2009 -0700
+++ b/Kamaelia/Internet/TCPClient.py	Sun Mar 15 16:32:27 2009 -0700
@@ -156,9 +156,8 @@
       """Main loop."""
 
       # wait before connecting
-      import time
-      t=time.time()
-      while time.time()-t<self.delay:
+      waitUntil = time.time() + self.delay
+      while time.time() < waitUntil:
          yield 1
 
       for v in self.runClient():
@@ -262,11 +261,11 @@
          try:
             sock.setblocking(0); yield 0.6
             try:
-               startConnect = time.time()
+               tryUntil = time.time() + self.connect_timeout
                while not self.safeConnect(sock,(self.host, self.port)):
                   if self.shutdown():
                       return
-                  if ( time.time() - startConnect ) > self.connect_timeout:
+                  if time.time() >= tryUntil:
                       self.howDied = "timeout"
                       raise Finality
                   yield 1