summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiampaolo RodolĂ  <g.rodola@gmail.com>2011-03-03 14:09:45 (GMT)
committerGiampaolo RodolĂ  <g.rodola@gmail.com>2011-03-03 14:09:45 (GMT)
commit2f95dc02257dd764a5eac5b6e0a222cdfdf6e65e (patch)
tree109a7fd425e54ea427e333737ea25c01be7a3595
parent88f416e4250e2b4faa53bb8850025da853d11ec1 (diff)
downloadcpython-2f95dc02257dd764a5eac5b6e0a222cdfdf6e65e.zip
cpython-2f95dc02257dd764a5eac5b6e0a222cdfdf6e65e.tar.gz
cpython-2f95dc02257dd764a5eac5b6e0a222cdfdf6e65e.tar.bz2
Merged revisions 88722 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88722 | giampaolo.rodola | 2011-03-03 14:57:47 +0100 (gio, 03 mar 2011) | 1 line Fix issue 11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors on accept(), recv() and send(). ........
-rw-r--r--Lib/asyncore.py10
-rw-r--r--Misc/NEWS3
2 files changed, 10 insertions, 3 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 861495d..00464a9 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -52,7 +52,11 @@ import sys
import time
import os
from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, EINVAL, \
- ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, errorcode
+ ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, EPIPE, \
+ EAGAIN, errorcode
+
+_DISCONNECTED = frozenset((ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE,
+ EBADF))
try:
socket_map
@@ -107,7 +111,7 @@ def readwrite(obj, flags):
if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL):
obj.handle_close()
except socket.error as e:
- if e.args[0] not in (EBADF, ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED):
+ if e.args[0] not in _DISCONNECTED:
obj.handle_error()
else:
obj.handle_close()
@@ -349,7 +353,7 @@ class dispatcher:
except TypeError:
return None
except socket.error as why:
- if why.args[0] in (EWOULDBLOCK, ECONNABORTED):
+ if why.args[0] in (EWOULDBLOCK, ECONNABORTED, EAGAIN):
return None
else:
raise
diff --git a/Misc/NEWS b/Misc/NEWS
index d241c2e..ed3f72a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@ Core and Builtins
Library
-------
+- Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors
+ on accept(), send() and recv().
+
- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
larger than 4GB. Patch by Nadeem Vawda.