x
/
deb-oslo.privsep
Code Issues Proposed changes

Merge "Remove unused py27 socketpair/makefile workaround"

This commit is contained in:
Jenkins 2016-04-22 01:37:53 +00:00 committed by Gerrit Code Review
parent 05ba634988 79ab8a755c
commit be46f78fc3
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oslo_privsep/daemon.py
View File

@ -227,14 +227,6 @@ class ForkingClientChannel(_ClientChannel):
sock_a, sock_b = socket.socketpair()
# Python bug workaround. It seems socketpair sockets aren't
# wrapped in the same way as socket.socket return values are. The
# unwrapped socket object in py27 contains a broken .makefile
# implementation (tries to seek).
if not isinstance(sock_a, socket.SocketType):
sock_a = socket.SocketType(_sock=sock_a)
sock_b = socket.SocketType(_sock=sock_b)
for s in (sock_a, sock_b):
s.setblocking(True)
# Important that these sockets don't get leaked