Mailman 3 December 2015 - Python-checkins

cpython (3.4): asyncio/tests: Fix ResourceWarnings related to unclosed transports
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/56095b0e7890 changeset: 99595:56095b0e7890 branch: 3.4 parent: 99592:5fdcadf94c0d user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 20:23:26 2015 -0500 summary: asyncio/tests: Fix ResourceWarnings related to unclosed transports files: Lib/test/test_asyncio/test_base_events.py | 47 ++++++---- 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1157,21 +1157,28 @@ self.loop.add_writer = mock.Mock() self.loop.add_writer._is_coroutine = False - coro = self.loop.create_connection(MyProto, '1.2.3.4', 80) - self.loop.run_until_complete(coro) - sock.connect.assert_called_with(('1.2.3.4', 80)) - m_socket.socket.assert_called_with(family=m_socket.AF_INET, - proto=m_socket.IPPROTO_TCP, - type=m_socket.SOCK_STREAM) + coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80) + t, p = self.loop.run_until_complete(coro) + try: + sock.connect.assert_called_with(('1.2.3.4', 80)) + m_socket.socket.assert_called_with(family=m_socket.AF_INET, + proto=m_socket.IPPROTO_TCP, + type=m_socket.SOCK_STREAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close sock.family = socket.AF_INET6 - coro = self.loop.create_connection(MyProto, '::2', 80) - - self.loop.run_until_complete(coro) - sock.connect.assert_called_with(('::2', 80)) - m_socket.socket.assert_called_with(family=m_socket.AF_INET6, - proto=m_socket.IPPROTO_TCP, - type=m_socket.SOCK_STREAM) + coro = self.loop.create_connection(asyncio.Protocol, '::2', 80) + t, p = self.loop.run_until_complete(coro) + try: + sock.connect.assert_called_with(('::2', 80)) + m_socket.socket.assert_called_with(family=m_socket.AF_INET6, + proto=m_socket.IPPROTO_TCP, + type=m_socket.SOCK_STREAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close @patch_socket def test_create_connection_ip_addr(self, m_socket): @@ -1559,11 +1566,15 @@ reuse_address=False, reuse_port=reuseport_supported) - self.loop.run_until_complete(coro) - bind.assert_called_with(('1.2.3.4', 0)) - m_socket.socket.assert_called_with(family=m_socket.AF_INET, - proto=m_socket.IPPROTO_UDP, - type=m_socket.SOCK_DGRAM) + t, p = self.loop.run_until_complete(coro) + try: + bind.assert_called_with(('1.2.3.4', 0)) + m_socket.socket.assert_called_with(family=m_socket.AF_INET, + proto=m_socket.IPPROTO_UDP, + type=m_socket.SOCK_DGRAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close def test_accept_connection_retry(self): sock = mock.Mock() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/37c4e7463b18 changeset: 99597:37c4e7463b18 parent: 99594:a4c1b8e699d8 parent: 99596:d56cfe234627 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 20:23:47 2015 -0500 summary: Merge 3.5 files: Lib/test/test_asyncio/test_base_events.py | 47 ++++++---- 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1157,21 +1157,28 @@ self.loop.add_writer = mock.Mock() self.loop.add_writer._is_coroutine = False - coro = self.loop.create_connection(MyProto, '1.2.3.4', 80) - self.loop.run_until_complete(coro) - sock.connect.assert_called_with(('1.2.3.4', 80)) - m_socket.socket.assert_called_with(family=m_socket.AF_INET, - proto=m_socket.IPPROTO_TCP, - type=m_socket.SOCK_STREAM) + coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80) + t, p = self.loop.run_until_complete(coro) + try: + sock.connect.assert_called_with(('1.2.3.4', 80)) + m_socket.socket.assert_called_with(family=m_socket.AF_INET, + proto=m_socket.IPPROTO_TCP, + type=m_socket.SOCK_STREAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close sock.family = socket.AF_INET6 - coro = self.loop.create_connection(MyProto, '::2', 80) - - self.loop.run_until_complete(coro) - sock.connect.assert_called_with(('::2', 80)) - m_socket.socket.assert_called_with(family=m_socket.AF_INET6, - proto=m_socket.IPPROTO_TCP, - type=m_socket.SOCK_STREAM) + coro = self.loop.create_connection(asyncio.Protocol, '::2', 80) + t, p = self.loop.run_until_complete(coro) + try: + sock.connect.assert_called_with(('::2', 80)) + m_socket.socket.assert_called_with(family=m_socket.AF_INET6, + proto=m_socket.IPPROTO_TCP, + type=m_socket.SOCK_STREAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close @patch_socket def test_create_connection_ip_addr(self, m_socket): @@ -1559,11 +1566,15 @@ reuse_address=False, reuse_port=reuseport_supported) - self.loop.run_until_complete(coro) - bind.assert_called_with(('1.2.3.4', 0)) - m_socket.socket.assert_called_with(family=m_socket.AF_INET, - proto=m_socket.IPPROTO_UDP, - type=m_socket.SOCK_DGRAM) + t, p = self.loop.run_until_complete(coro) + try: + bind.assert_called_with(('1.2.3.4', 0)) + m_socket.socket.assert_called_with(family=m_socket.AF_INET, + proto=m_socket.IPPROTO_UDP, + type=m_socket.SOCK_DGRAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close def test_accept_connection_retry(self): sock = mock.Mock() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): asyncio/tests: Fix some ResourceWarnings
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/5fdcadf94c0d changeset: 99592:5fdcadf94c0d branch: 3.4 parent: 99589:bc0dcc3d9ebe user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:51:09 2015 -0500 summary: asyncio/tests: Fix some ResourceWarnings files: Lib/test/test_asyncio/test_base_events.py | 18 ++++++---- Lib/test/test_asyncio/test_streams.py | 13 ++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -127,23 +127,27 @@ def test_check_resolved_address(self): sock = socket.socket(socket.AF_INET) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) sock = socket.socket(socket.AF_INET6) - base_events._check_resolved_address(sock, ('::3', 1)) - base_events._check_resolved_address(sock, ('::3%lo0', 1)) - self.assertRaises(ValueError, - base_events._check_resolved_address, sock, ('foo', 1)) + with sock: + base_events._check_resolved_address(sock, ('::3', 1)) + base_events._check_resolved_address(sock, ('::3%lo0', 1)) + with self.assertRaises(ValueError): + base_events._check_resolved_address(sock, ('foo', 1)) def test_check_resolved_sock_type(self): # Ensure we ignore extra flags in sock.type. if hasattr(socket, 'SOCK_NONBLOCK'): sock = socket.socket(type=socket.SOCK_STREAM | socket.SOCK_NONBLOCK) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) if hasattr(socket, 'SOCK_CLOEXEC'): sock = socket.socket(type=socket.SOCK_STREAM | socket.SOCK_CLOEXEC) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) class BaseEventLoopTests(test_utils.TestCase): diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -647,12 +647,13 @@ def server(): # Runs in a separate thread. sock = socket.socket() - sock.bind(('localhost', 0)) - sock.listen(1) - addr = sock.getsockname() - q.put(addr) - clt, _ = sock.accept() - clt.close() + with sock: + sock.bind(('localhost', 0)) + sock.listen(1) + addr = sock.getsockname() + q.put(addr) + clt, _ = sock.accept() + clt.close() @asyncio.coroutine def client(host, port): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/a4c1b8e699d8 changeset: 99594:a4c1b8e699d8 parent: 99591:e54e1d02c5a2 parent: 99593:e94c278daa10 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:51:31 2015 -0500 summary: Merge 3.5 files: Lib/test/test_asyncio/test_base_events.py | 18 ++++++---- Lib/test/test_asyncio/test_streams.py | 13 ++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -127,23 +127,27 @@ def test_check_resolved_address(self): sock = socket.socket(socket.AF_INET) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) sock = socket.socket(socket.AF_INET6) - base_events._check_resolved_address(sock, ('::3', 1)) - base_events._check_resolved_address(sock, ('::3%lo0', 1)) - self.assertRaises(ValueError, - base_events._check_resolved_address, sock, ('foo', 1)) + with sock: + base_events._check_resolved_address(sock, ('::3', 1)) + base_events._check_resolved_address(sock, ('::3%lo0', 1)) + with self.assertRaises(ValueError): + base_events._check_resolved_address(sock, ('foo', 1)) def test_check_resolved_sock_type(self): # Ensure we ignore extra flags in sock.type. if hasattr(socket, 'SOCK_NONBLOCK'): sock = socket.socket(type=socket.SOCK_STREAM | socket.SOCK_NONBLOCK) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) if hasattr(socket, 'SOCK_CLOEXEC'): sock = socket.socket(type=socket.SOCK_STREAM | socket.SOCK_CLOEXEC) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) class BaseEventLoopTests(test_utils.TestCase): diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -647,12 +647,13 @@ def server(): # Runs in a separate thread. sock = socket.socket() - sock.bind(('localhost', 0)) - sock.listen(1) - addr = sock.getsockname() - q.put(addr) - clt, _ = sock.accept() - clt.close() + with sock: + sock.bind(('localhost', 0)) + sock.listen(1) + addr = sock.getsockname() + q.put(addr) + clt, _ = sock.accept() + clt.close() @asyncio.coroutine def client(host, port): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Merge 3.4
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/e94c278daa10 changeset: 99593:e94c278daa10 branch: 3.5 parent: 99590:4e263be33d4f parent: 99592:5fdcadf94c0d user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:51:19 2015 -0500 summary: Merge 3.4 files: Lib/test/test_asyncio/test_base_events.py | 18 ++++++---- Lib/test/test_asyncio/test_streams.py | 13 ++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -127,23 +127,27 @@ def test_check_resolved_address(self): sock = socket.socket(socket.AF_INET) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) sock = socket.socket(socket.AF_INET6) - base_events._check_resolved_address(sock, ('::3', 1)) - base_events._check_resolved_address(sock, ('::3%lo0', 1)) - self.assertRaises(ValueError, - base_events._check_resolved_address, sock, ('foo', 1)) + with sock: + base_events._check_resolved_address(sock, ('::3', 1)) + base_events._check_resolved_address(sock, ('::3%lo0', 1)) + with self.assertRaises(ValueError): + base_events._check_resolved_address(sock, ('foo', 1)) def test_check_resolved_sock_type(self): # Ensure we ignore extra flags in sock.type. if hasattr(socket, 'SOCK_NONBLOCK'): sock = socket.socket(type=socket.SOCK_STREAM | socket.SOCK_NONBLOCK) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) if hasattr(socket, 'SOCK_CLOEXEC'): sock = socket.socket(type=socket.SOCK_STREAM | socket.SOCK_CLOEXEC) - base_events._check_resolved_address(sock, ('1.2.3.4', 1)) + with sock: + base_events._check_resolved_address(sock, ('1.2.3.4', 1)) class BaseEventLoopTests(test_utils.TestCase): diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -647,12 +647,13 @@ def server(): # Runs in a separate thread. sock = socket.socket() - sock.bind(('localhost', 0)) - sock.listen(1) - addr = sock.getsockname() - q.put(addr) - clt, _ = sock.accept() - clt.close() + with sock: + sock.bind(('localhost', 0)) + sock.listen(1) + addr = sock.getsockname() + q.put(addr) + clt, _ = sock.accept() + clt.close() @asyncio.coroutine def client(host, port): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Merge 3.4
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/4e263be33d4f changeset: 99590:4e263be33d4f branch: 3.5 parent: 99587:5629ccdfc874 parent: 99589:bc0dcc3d9ebe user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:40:11 2015 -0500 summary: Merge 3.4 files: Lib/test/test_asyncio/test_streams.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -351,7 +351,7 @@ self.assertEqual(b'', data) self.assertEqual(self.DATA, stream._buffer) - with self.assertRaisesRegexp(ValueError, 'less than zero'): + with self.assertRaisesRegex(ValueError, 'less than zero'): self.loop.run_until_complete(stream.readexactly(-1)) self.assertEqual(self.DATA, stream._buffer) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): asyncio/tests: Fix deprecation warning
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/bc0dcc3d9ebe changeset: 99589:bc0dcc3d9ebe branch: 3.4 parent: 99586:33c7980552a6 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:40:03 2015 -0500 summary: asyncio/tests: Fix deprecation warning files: Lib/test/test_asyncio/test_streams.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -351,7 +351,7 @@ self.assertEqual(b'', data) self.assertEqual(self.DATA, stream._buffer) - with self.assertRaisesRegexp(ValueError, 'less than zero'): + with self.assertRaisesRegex(ValueError, 'less than zero'): self.loop.run_until_complete(stream.readexactly(-1)) self.assertEqual(self.DATA, stream._buffer) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/e54e1d02c5a2 changeset: 99591:e54e1d02c5a2 parent: 99588:3d19bbabb5ec parent: 99590:4e263be33d4f user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:40:23 2015 -0500 summary: Merge 3.5 files: Lib/test/test_asyncio/test_streams.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -351,7 +351,7 @@ self.assertEqual(b'', data) self.assertEqual(self.DATA, stream._buffer) - with self.assertRaisesRegexp(ValueError, 'less than zero'): + with self.assertRaisesRegex(ValueError, 'less than zero'): self.loop.run_until_complete(stream.readexactly(-1)) self.assertEqual(self.DATA, stream._buffer) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Merge 3.4
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/5629ccdfc874 changeset: 99587:5629ccdfc874 branch: 3.5 parent: 99584:53106c39c2e0 parent: 99586:33c7980552a6 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:35:39 2015 -0500 summary: Merge 3.4 files: Lib/test/test_asyncio/test_base_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1368,7 +1368,7 @@ self.assertRaises( OSError, self.loop.run_until_complete, coro) - @patch_socket + @patch_socket def test_create_datagram_endpoint_socket_err(self, m_socket): m_socket.getaddrinfo = socket.getaddrinfo m_socket.socket.side_effect = OSError -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5
by yury.selivanov 17 Dec '15

17 Dec '15

https://hg.python.org/cpython/rev/3d19bbabb5ec changeset: 99588:3d19bbabb5ec parent: 99585:ceb50507ae88 parent: 99587:5629ccdfc874 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Wed Dec 16 19:36:01 2015 -0500 summary: Merge 3.5 files: Lib/test/test_asyncio/test_base_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1368,7 +1368,7 @@ self.assertRaises( OSError, self.loop.run_until_complete, coro) - @patch_socket + @patch_socket def test_create_datagram_endpoint_socket_err(self, m_socket): m_socket.getaddrinfo = socket.getaddrinfo m_socket.socket.side_effect = OSError -- Repository URL: https://hg.python.org/cpython

1 0