dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ robey@master-shake.local-20060209030347-a7238bae41dad9d7] 

doing a close() on Transport.__del__ is useless: because a Transport can't go away until all its Channels are collected, it will never make a difference.  so don't do it, cuz __del__ is pretty hairy.
This commit is contained in:
Robey Pointer 2006-02-08 19:03:47 -08:00
parent 27ccd56af7
commit 07dfbd5808
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
paramiko/transport.py
View File

@ -298,9 +298,6 @@ class Transport (threading.Thread):
self.server_accept_cv = threading.Condition(self.lock) self.server_accept_cv = threading.Condition(self.lock)
self.subsystem_table = { } self.subsystem_table = { }
def __del__(self):
self.close()
def __repr__(self): def __repr__(self):
""" """
Returns a string representation of this object, for debugging. Returns a string representation of this object, for debugging.
@ -551,13 +548,9 @@ class Transport (threading.Thread):
Close this session, and any open channels that are tied to it. Close this session, and any open channels that are tied to it.
""" """
self.active = False self.active = False
# since this may be called from __del__, can't assume any attributes exist
try:
self.packetizer.close() self.packetizer.close()
for chan in self.channels.values(): for chan in self.channels.values():
chan._unlink() chan._unlink()
except AttributeError:
pass
def get_remote_server_key(self): def get_remote_server_key(self):
""" """