summaryrefslogtreecommitdiffstats
path: root/Lib/asyncore.py
diff options
context:
space:
mode:
authorJosiah Carlson <josiah.carlson@gmail.com>2008-07-07 04:51:46 (GMT)
committerJosiah Carlson <josiah.carlson@gmail.com>2008-07-07 04:51:46 (GMT)
commitff5f42088bdbe9fe801a52ba3a9d63bbaacdf2a2 (patch)
tree3b3f592891450032d0f3769d70540434550627d3 /Lib/asyncore.py
parent3b1e6b2f833d1e030b2ff853e1a942dc0de968f5 (diff)
downloadcpython-ff5f42088bdbe9fe801a52ba3a9d63bbaacdf2a2.zip
cpython-ff5f42088bdbe9fe801a52ba3a9d63bbaacdf2a2.tar.gz
cpython-ff5f42088bdbe9fe801a52ba3a9d63bbaacdf2a2.tar.bz2
Fixed bugs 760475, 953599, and 1519.
Diffstat (limited to 'Lib/asyncore.py')
-rw-r--r--Lib/asyncore.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 305d895..e06b3b4 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -99,8 +99,10 @@ def readwrite(obj, flags):
obj.handle_read_event()
if flags & select.POLLOUT:
obj.handle_write_event()
- if flags & (select.POLLERR | select.POLLHUP | select.POLLNVAL):
+ if flags & (select.POLLERR | select.POLLNVAL):
obj.handle_expt_event()
+ if flags & select.POLLHUP:
+ obj.handle_close_event()
except (ExitNow, KeyboardInterrupt, SystemExit):
raise
except:
@@ -467,7 +469,7 @@ class dispatcher:
),
'error'
)
- self.close()
+ self.handle_close()
def handle_expt(self):
self.log_info('unhandled exception', 'warning')