summaryrefslogtreecommitdiffstats
path: root/Lib/SocketServer.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-04-08 23:41:34 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-04-08 23:41:34 (GMT)
commitb5588c3f94b351c7c57fd7d26a305200b5a6c45f (patch)
treed3db69f59b4fd9d428796dace9777f5af901f211 /Lib/SocketServer.py
parent467a5c406728be2c9897013411a2dc649b2db01f (diff)
downloadcpython-b5588c3f94b351c7c57fd7d26a305200b5a6c45f.zip
cpython-b5588c3f94b351c7c57fd7d26a305200b5a6c45f.tar.gz
cpython-b5588c3f94b351c7c57fd7d26a305200b5a6c45f.tar.bz2
Fix the patch for issue #7978: select() raises select.error before 3.3, not OSError.
Diffstat (limited to 'Lib/SocketServer.py')
-rw-r--r--Lib/SocketServer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index a44e137..1594321 100644
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -153,8 +153,8 @@ def _eintr_retry(func, *args):
while True:
try:
return func(*args)
- except OSError as e:
- if e.errno != errno.EINTR:
+ except (OSError, select.error) as e:
+ if e.args[0] != errno.EINTR:
raise
class BaseServer: