In poll(), check connections for exceptional conditions

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 9c36977630683f9416631a18f40fa841238e2905..f63a83eebadd4c32e824b9cc4ae6a02314ea82b3 100644 (file)
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -80,6 +80,14 @@ def write(obj):
     except:
         obj.handle_error()
 
+def _exception (obj):
+    try:
+        obj.handle_expt_event()
+    except ExitNow:
+        raise
+    except:
+        obj.handle_error()
+
 def readwrite(obj, flags):
     try:
         if flags & (select.POLLIN | select.POLLPRI):
@@ -99,6 +107,7 @@ def poll(timeout=0.0, map=None):
     if map:
         r = []; w = []; e = []
         for fd, obj in map.items():
+            e.append(fd)
             if obj.readable():
                 r.append(fd)
             if obj.writable():
@@ -126,6 +135,12 @@ def poll(timeout=0.0, map=None):
                 continue
             write(obj)
 
+        for fd in e:
+            obj = map.get(fd)
+            if obj is None:
+                continue
+            _exception(obj)
+
 def poll2(timeout=0.0, map=None):
     # Use the poll() support added to the select module in Python 2.0
     if map is None: