summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobey Pointer <robey@lag.net>2004-04-08 05:12:20 +0000
committerRobey Pointer <robey@lag.net>2004-04-08 05:12:20 +0000
commit7a3323118e64064f788942c0303bf90e22c87676 (patch)
tree9219e902956060e052da84980cce3c4f8409e758
parent5691415af1c35fc6dc931d274726a9b336137483 (diff)
[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-47]
add socket.timeout for py22 oops, forgot this vital part of the py22 patches. roger binns sent me a code patch that included this snip.
-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