mirror of
https://github.com/frappe/gunicorn.git
synced 2026-01-14 11:09:11 +08:00
socketfromfd: remove python 2 compatibility
This commit is contained in:
parent
20774b8331
commit
404a712023
@ -95,15 +95,8 @@ def fromfd(fd, keep_fd=True):
|
|||||||
family = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_DOMAIN)
|
family = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_DOMAIN)
|
||||||
typ = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_TYPE)
|
typ = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_TYPE)
|
||||||
proto = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_PROTOCOL)
|
proto = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_PROTOCOL)
|
||||||
if sys.version_info.major == 2:
|
s
|
||||||
# Python 2 has no fileno argument and always duplicates the fd
|
if keep_fd:
|
||||||
sockobj = socket.fromfd(fd, family, typ, proto)
|
return socket.fromfd(fd, family, typ, proto)
|
||||||
sock = socket.socket(None, None, None, _sock=sockobj)
|
|
||||||
if not keep_fd:
|
|
||||||
os.close(fd)
|
|
||||||
return sock
|
|
||||||
else:
|
else:
|
||||||
if keep_fd:
|
return socket.socket(family, typ, proto, fileno=fd)
|
||||||
return socket.fromfd(fd, family, typ, proto)
|
|
||||||
else:
|
|
||||||
return socket.socket(family, typ, proto, fileno=fd)
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user