summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPierce Lopez <pierce.lopez@gmail.com>2017-02-22 18:49:39 -0500
committerPierce Lopez <pierce.lopez@gmail.com>2017-06-01 18:20:28 -0400
commitcdb2326612985b3969d2c2064eba8d16146463f8 (patch)
tree0e736cff45090c7d4d646dc26c44304d5ddc2d4a
parent08b07ebde3d6699073e9d1a0f599f940a1834d71 (diff)
transport: remove compat for old python lacking sock.settimeout()
-rw-r--r--paramiko/transport.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 96bd4a07..7f38bffa 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -319,14 +319,9 @@ class Transport (threading.Thread, ClosingContextManager):
threading.Thread.__init__(self)
self.setDaemon(True)
self.sock = sock
- # Python < 2.3 doesn't have the settimeout method - RogerB
- try:
- # we set the timeout so we can check self.active periodically to
- # see if we should bail. socket.timeout exception is never
- # propagated.
- self.sock.settimeout(self._active_check_timeout)
- except AttributeError:
- pass
+ # we set the timeout so we can check self.active periodically to
+ # see if we should bail. socket.timeout exception is never propagated.
+ self.sock.settimeout(self._active_check_timeout)
# negotiated crypto parameters
self.packetizer = Packetizer(sock)