From 404a7120234e2b1119f4e8a3662c542e4d8700c8 Mon Sep 17 00:00:00 2001 From: benoitc Date: Mon, 25 Nov 2019 10:25:44 +0100 Subject: [PATCH] socketfromfd: remove python 2 compatibility --- gunicorn/socketfromfd.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gunicorn/socketfromfd.py b/gunicorn/socketfromfd.py index 71b40d3c..a7f7b899 100644 --- a/gunicorn/socketfromfd.py +++ b/gunicorn/socketfromfd.py @@ -95,15 +95,8 @@ def fromfd(fd, keep_fd=True): family = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_DOMAIN) typ = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_TYPE) proto = _raw_getsockopt(fd, socket.SOL_SOCKET, SO_PROTOCOL) - if sys.version_info.major == 2: - # Python 2 has no fileno argument and always duplicates the fd - sockobj = socket.fromfd(fd, family, typ, proto) - sock = socket.socket(None, None, None, _sock=sockobj) - if not keep_fd: - os.close(fd) - return sock + s + if keep_fd: + return socket.fromfd(fd, family, typ, proto) else: - if keep_fd: - return socket.fromfd(fd, family, typ, proto) - else: - return socket.socket(family, typ, proto, fileno=fd) + return socket.socket(family, typ, proto, fileno=fd)