[Python-checkins] r88725 - in python/branches/release31-maint: Lib/asyncore.py Misc/NEWS

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Thu Mar  3 15:09:45 2011
New Revision: 88725

Log:
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().
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/asyncore.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/asyncore.py
==============================================================================
--- python/branches/release31-maint/Lib/asyncore.py	(original)
+++ python/branches/release31-maint/Lib/asyncore.py	Thu Mar  3 15:09:45 2011
@@ -52,7 +52,11 @@
 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 @@
         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 @@
         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

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Thu Mar  3 15:09:45 2011
@@ -37,6 +37,9 @@
 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.