diff options
| author | Christian Heimes <christian@python.org> | 2018-01-29 21:37:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 21:37:58 (GMT) |
| commit | b6e43af669f61a37a29d8ff0785455108e6bc29d (patch) | |
| tree | 3a6c733b60cf579c43b18cabdc9a7a3ce113f81b /Lib/socket.py | |
| parent | 72a0d218dcc94a3cc409a9ef32dfcd5a7bbcb43c (diff) | |
| download | cpython-b6e43af669f61a37a29d8ff0785455108e6bc29d.zip cpython-b6e43af669f61a37a29d8ff0785455108e6bc29d.tar.gz cpython-b6e43af669f61a37a29d8ff0785455108e6bc29d.tar.bz2 | |
bpo-28134: Auto-detect socket values from file descriptor (#1349)
Fix socket(fileno=fd) by auto-detecting the socket's family, type,
and proto from the file descriptor. The auto-detection can be overruled
by passing in family, type, and proto explicitly.
Without the fix, all socket except for TCP/IP over IPv4 are basically broken:
>>> s = socket.create_connection(('www.python.org', 443))
>>> s
<socket.socket fd=3, family=AddressFamily.AF_INET6, type=SocketKind.SOCK_STREAM, proto=6, laddr=('2003:58:bc4a:3b00:56ee:75ff:fe47:ca7b', 59730, 0, 0), raddr=('2a04:4e42:1b::223', 443, 0, 0)>
>>> socket.socket(fileno=s.fileno())
<socket.socket fd=3, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=0, laddr=('2003:58:bc4a:3b00::%2550471192', 59730, 0, 2550471192), raddr=('2a04:4e42:1b:0:700c:e70b:ff7f:0%2550471192', 443, 0, 2550471192)>
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/socket.py')
| -rw-r--r-- | Lib/socket.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/socket.py b/Lib/socket.py index 2d8aee3..cfa605a 100644 --- a/Lib/socket.py +++ b/Lib/socket.py @@ -136,11 +136,18 @@ class socket(_socket.socket): __slots__ = ["__weakref__", "_io_refs", "_closed"] - def __init__(self, family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None): + def __init__(self, family=-1, type=-1, proto=-1, fileno=None): # For user code address family and type values are IntEnum members, but # for the underlying _socket.socket they're just integers. The # constructor of _socket.socket converts the given argument to an # integer automatically. + if fileno is None: + if family == -1: + family = AF_INET + if type == -1: + type = SOCK_STREAM + if proto == -1: + proto = 0 _socket.socket.__init__(self, family, type, proto, fileno) self._io_refs = 0 self._closed = False |