summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--paramiko/common.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/paramiko/common.py b/paramiko/common.py
index 88e8b1aa..c9d5558f 100644
--- a/paramiko/common.py
+++ b/paramiko/common.py
@@ -68,6 +68,12 @@ if sys.version_info < (2, 3):
import logging22 as logging
import select
PY22 = True
+
+ import socket
+ if not hasattr(socket, 'timeout'):
+ class timeout(socket.error): pass
+ socket.timeout = timeout
+ del timeout
else:
import logging
PY22 = False