From a10dc3efcbba8aa7cc7d1a017f8b22fc4fa8e87c Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 28 Nov 2017 11:15:26 +0100 Subject: [PATCH] asyncio: use directly socket.socketpair() (#4597) Since Python 3.5, socket.socketpair() is also available on Windows, and so can be used directly, rather than using asyncio.windows_utils.socketpair(). --- Lib/asyncio/proactor_events.py | 5 +---- Lib/asyncio/selector_events.py | 5 +---- Lib/asyncio/unix_events.py | 5 +---- Lib/asyncio/windows_events.py | 6 ------ Lib/test/test_asyncio/test_proactor_events.py | 18 ++++-------------- Lib/test/test_asyncio/test_selector_events.py | 3 --- Lib/test/test_asyncio/test_windows_events.py | 3 ++- 7 files changed, 9 insertions(+), 36 deletions(-) diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index e35d05b7bf0..d7aa5ff3017 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -446,9 +446,6 @@ def sock_connect(self, sock, address): def sock_accept(self, sock): return self._proactor.accept(sock) - def _socketpair(self): - raise NotImplementedError - def _close_self_pipe(self): if self._self_reading_future is not None: self._self_reading_future.cancel() @@ -461,7 +458,7 @@ def _close_self_pipe(self): def _make_self_pipe(self): # A self-socket, really. :-) - self._ssock, self._csock = self._socketpair() + self._ssock, self._csock = socket.socketpair() self._ssock.setblocking(False) self._csock.setblocking(False) self._internal_fds += 1 diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 4baad48ce39..ef6f0ac458d 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -96,9 +96,6 @@ def close(self): self._selector.close() self._selector = None - def _socketpair(self): - raise NotImplementedError - def _close_self_pipe(self): self._remove_reader(self._ssock.fileno()) self._ssock.close() @@ -109,7 +106,7 @@ def _close_self_pipe(self): def _make_self_pipe(self): # A self-socket, really. :-) - self._ssock, self._csock = self._socketpair() + self._ssock, self._csock = socket.socketpair() self._ssock.setblocking(False) self._csock.setblocking(False) self._internal_fds += 1 diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index be98f334cec..94157f8c809 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -55,9 +55,6 @@ def __init__(self, selector=None): super().__init__(selector) self._signal_handlers = {} - def _socketpair(self): - return socket.socketpair() - def close(self): super().close() for sig in list(self._signal_handlers): @@ -677,7 +674,7 @@ def _start(self, args, shell, stdin, stdout, stderr, bufsize, **kwargs): # socket (which we use in order to detect closing of the # other end). Notably this is needed on AIX, and works # just fine on other platforms. - stdin, stdin_w = self._loop._socketpair() + stdin, stdin_w = socket.socketpair() # Mark the write end of the stdin pipe as non-inheritable, # needed by close_fds=False on Python 3.3 and older diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 6045ba029e5..031e3f1874e 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -296,9 +296,6 @@ def close(self): class _WindowsSelectorEventLoop(selector_events.BaseSelectorEventLoop): """Windows version of selector event loop.""" - def _socketpair(self): - return windows_utils.socketpair() - class ProactorEventLoop(proactor_events.BaseProactorEventLoop): """Windows version of proactor event loop using IOCP.""" @@ -308,9 +305,6 @@ def __init__(self, proactor=None): proactor = IocpProactor() super().__init__(proactor) - def _socketpair(self): - return windows_utils.socketpair() - @coroutine def create_pipe_connection(self, protocol_factory, address): f = self._proactor.connect_pipe(address) diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py index 7a8b52352d6..def08b96ab0 100644 --- a/Lib/test/test_asyncio/test_proactor_events.py +++ b/Lib/test/test_asyncio/test_proactor_events.py @@ -444,15 +444,13 @@ def setUp(self): self.ssock, self.csock = mock.Mock(), mock.Mock() - class EventLoop(BaseProactorEventLoop): - def _socketpair(s): - return (self.ssock, self.csock) - - self.loop = EventLoop(self.proactor) + with mock.patch('asyncio.proactor_events.socket.socketpair', + return_value=(self.ssock, self.csock)): + self.loop = BaseProactorEventLoop(self.proactor) self.set_event_loop(self.loop) @mock.patch.object(BaseProactorEventLoop, 'call_soon') - @mock.patch.object(BaseProactorEventLoop, '_socketpair') + @mock.patch('asyncio.proactor_events.socket.socketpair') def test_ctor(self, socketpair, call_soon): ssock, csock = socketpair.return_value = ( mock.Mock(), mock.Mock()) @@ -506,14 +504,6 @@ def test_sock_accept(self): self.loop.sock_accept(self.sock) self.proactor.accept.assert_called_with(self.sock) - def test_socketpair(self): - class EventLoop(BaseProactorEventLoop): - # override the destructor to not log a ResourceWarning - def __del__(self): - pass - self.assertRaises( - NotImplementedError, EventLoop, self.proactor) - def test_make_socket_transport(self): tr = self.loop._make_socket_transport(self.sock, asyncio.Protocol()) self.assertIsInstance(tr, _ProactorSocketTransport) diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py index 2adb43ae725..7db943e8009 100644 --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -154,9 +154,6 @@ def test_close_no_selector(self): self.loop.close() self.assertIsNone(self.loop._selector) - def test_socketpair(self): - self.assertRaises(NotImplementedError, self.loop._socketpair) - def test_read_from_self_tryagain(self): self.loop._ssock.recv.side_effect = BlockingIOError self.assertIsNone(self.loop._read_from_self()) diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py index c72eef1afdb..b70c0b7ebb8 100644 --- a/Lib/test/test_asyncio/test_windows_events.py +++ b/Lib/test/test_asyncio/test_windows_events.py @@ -1,4 +1,5 @@ import os +import socket import sys import unittest from unittest import mock @@ -36,7 +37,7 @@ def setUp(self): self.set_event_loop(self.loop) def test_close(self): - a, b = self.loop._socketpair() + a, b = socket.socketpair() trans = self.loop._make_socket_transport(a, asyncio.Protocol()) f = asyncio.ensure_future(self.loop.sock_recv(b, 100)) trans.close()