From e22813067e4f62629a9c24947c29a55861fb05f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Charles-Fran=C3=A7ois=20Natali?= Date: Thu, 14 Jul 2011 19:53:38 +0200 Subject: [PATCH] Issue #12502: asyncore: fix polling loop with AF_UNIX sockets. --- Lib/asyncore.py | 6 ++++-- Misc/NEWS | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 00464a9427..3f0d2d365c 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -130,7 +130,8 @@ def poll(timeout=0.0, map=None): is_w = obj.writable() if is_r: r.append(fd) - if is_w: + # accepting sockets should not be writable + if is_w and not obj.accepting: w.append(fd) if is_r or is_w: e.append(fd) @@ -177,7 +178,8 @@ def poll2(timeout=0.0, map=None): flags = 0 if obj.readable(): flags |= select.POLLIN | select.POLLPRI - if obj.writable(): + # accepting sockets should not be writable + if obj.writable() and not obj.accepting: flags |= select.POLLOUT if flags: # Only check for exceptions if object was either readable diff --git a/Misc/NEWS b/Misc/NEWS index 1e98768a76..63d5c24e6e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,6 +22,8 @@ What's New in Python 3.1.4? Library ------- +- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets. + - Issue #12009: Fixed regression in netrc file comment handling. Extension Modules -- 2.40.0