[project @ robey@lag.net-20061112063054-bf71926ff8c98c68]

a bit of cleanup in close() to try harder to avoid having lingering threads

paramiko/channel.py

@@ -92,7 +92,10 @@ def __init__(self, chanid):
         self.exit_status = -1
 
     def __del__(self):
-        self.close()
+        try:
+            self.close()
+        except:
+            pass
 
     def __repr__(self):
         """

paramiko/packet.py

@@ -149,6 +149,7 @@ def set_inbound_compressor(self, compressor):
 
     def close(self):
         self.__closed = True
+        self.__socket.close()
 
     def set_hexdump(self, hexdump):
         self.__dump_packets = hexdump

paramiko/transport.py

@@ -543,10 +543,13 @@ def close(self):
         """
         Close this session, and any open channels that are tied to it.
         """
+        if not self.active:
+            return
         self.active = False
         self.packetizer.close()
         for chan in self.channels.values():
             chan._unlink()
+        self.join()
 
     def get_remote_server_key(self):
         """