summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Noonan <snoonan@amazon.com>2013-04-11 16:27:49 -0700
committerSteven Noonan <snoonan@amazon.com>2013-04-11 16:27:49 -0700
commit5c124cb1362f08296802f8d4856eaa18c0b35b00 (patch)
tree89392a7eeefb3076ada2db20cd22111ba5b4c034
parent068bf63cf03d689187bede5c11b6c38ec2b2a8e1 (diff)
un-break Python 2.5 compatibility by using isAlive() instead of is_alive()
Python's documentation has a bug[1], in that it doesn't correctly annotate is_alive as being a function introduced in Python 2.6. [1] http://bugs.python.org/issue15126 Signed-off-by: Steven Noonan <snoonan@amazon.com>
-rw-r--r--paramiko/transport.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 0197ced0..fd63732f 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -1389,7 +1389,7 @@ class Transport (threading.Thread):
def stop_thread(self):
self.active = False
self.packetizer.close()
- while self.is_alive():
+ while self.isAlive():
self.join(10)