diff options
| -rw-r--r-- | Lib/asyncore.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS | 12 |
2 files changed, 20 insertions, 2 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 16fe43a..8b9ba87 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -103,10 +103,16 @@ def readwrite(obj, flags): obj.handle_read_event() if flags & select.POLLOUT: obj.handle_write_event() - if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL): - obj.handle_close() if flags & select.POLLPRI: obj.handle_expt_event() + if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL): + obj.handle_close() + except socket.error, e: + if e.args[0] not in (EBADF, ECONNRESET, ENOTCONN, ESHUTDOWN, +ECONNABORTED): + obj.handle_error() + else: + obj.handle_close() except _reraised_exceptions: raise except: @@ -4,6 +4,18 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.6.6? +=========================== + +*Release date: XXXX-XX-XX* + +Library +------- + +- Issue #5798: Handle select.poll flag oddities properly on OS X. + This fixes test_asynchat and test_smtplib failures on OS X. + + What's New in Python 2.6.6 rc 1? ================================ |