From cdb2326612985b3969d2c2064eba8d16146463f8 Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Wed, 22 Feb 2017 18:49:39 -0500 Subject: transport: remove compat for old python lacking sock.settimeout() --- paramiko/transport.py | 11 +++-------- 1 file 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) -- cgit v1.2.3