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

[mark.dickinson]

Author: mark.dickinson
Date: Wed Aug  4 16:42:13 2010
New Revision: 83718

Log:
Issue #5798: Handle select.poll flag oddities properly on OS X.
This fixes test_asynchat and test_smtplib failures on OS X.
(Backport of r73182 from trunk.)


Modified:
   python/branches/release26-maint/Lib/asyncore.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/asyncore.py
==============================================================================
--- python/branches/release26-maint/Lib/asyncore.py	(original)
+++ python/branches/release26-maint/Lib/asyncore.py	Wed Aug  4 16:42:13 2010
@@ -103,10 +103,16 @@
             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:

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Wed Aug  4 16:42:13 2010
@@ -4,6 +4,18 @@
 
 (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?
 ================================