traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge - Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.

This commit is contained in:
Charles-François Natali 2011-07-14 20:00:49 +02:00
parent b6ffa7980f
commit f64f9e9ec1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/asyncore.py
View File

@ -132,7 +132,8 @@ def poll(timeout=0.0, map=None):
is_w = obj.writable() is_w = obj.writable()
if is_r: if is_r:
r.append(fd) r.append(fd)
if is_w: # accepting sockets should not be writable
if is_w and not obj.accepting:
w.append(fd) w.append(fd)
if is_r or is_w: if is_r or is_w:
e.append(fd) e.append(fd)
@ -179,7 +180,8 @@ def poll2(timeout=0.0, map=None):
flags = 0 flags = 0
if obj.readable(): if obj.readable():
flags |= select.POLLIN | select.POLLPRI flags |= select.POLLIN | select.POLLPRI
if obj.writable(): # accepting sockets should not be writable
if obj.writable() and not obj.accepting:
flags |= select.POLLOUT flags |= select.POLLOUT
if flags: if flags:
# Only check for exceptions if object was either readable # Only check for exceptions if object was either readable

2
Misc/NEWS
View File

@ -225,6 +225,8 @@ Core and Builtins
Library Library
------- -------
- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
- Issue #4376: ctypes now supports nested structures in a endian different than - Issue #4376: ctypes now supports nested structures in a endian different than
the parent structure. Patch by Vlad Riscutia. the parent structure. Patch by Vlad Riscutia.