Mailman 3 October 2016 - Python-checkins

cpython (3.5): Issue #28275: Clean up to avoid use-after-free after bzip decompress failure
by martin.panter Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/36d37ff6c236 changeset: 104209:36d37ff6c236 branch: 3.5 parent: 104204:f7688db81753 user: Martin Panter <vadmium+py(a)gmail.com> date: Sat Oct 01 02:45:17 2016 +0000 summary: Issue #28275: Clean up to avoid use-after-free after bzip decompress failure files: Lib/test/test_bz2.py | 6 ++++++ Lib/test/test_lzma.py | 8 +++----- Misc/NEWS | 3 ++- Modules/_bz2module.c | 4 +++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -821,6 +821,12 @@ out.append(bzd.decompress(self.DATA[300:])) self.assertEqual(b''.join(out), self.TEXT) + def test_failure(self): + bzd = BZ2Decompressor() + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + class CompressDecompressTest(BaseTest): def testCompress(self): data = bz2.compress(self.TEXT) diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -249,11 +249,9 @@ def test_decompressor_bug_28275(self): # Test coverage for Issue 28275 lzd = LZMADecompressor() - for i in range(2): - try: - lzd.decompress(COMPRESSED_RAW_1) - except LZMAError: - pass + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) # Test that LZMACompressor->LZMADecompressor preserves the input data. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -95,7 +95,8 @@ that they don't call itermonthdates() which can cause datetime.date under/overflow. -- Issue #28275: Fixed possible use adter free in LZMADecompressor.decompress(). +- Issue #28275: Fixed possible use after free in the decompress() + methods of the LZMADecompressor and BZ2Decompressor classes. Original patch by John Leitch. - Issue #27897: Fixed possible crash in sqlite3.Connection.create_collation() diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -534,8 +534,10 @@ } result = decompress_buf(d, max_length); - if(result == NULL) + if(result == NULL) { + bzs->next_in = NULL; return NULL; + } if (d->eof) { d->needs_input = 0; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Issue #28275: Merge bz2 fix from 3.5 into 3.6
by martin.panter Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/dca18f0ec280 changeset: 104210:dca18f0ec280 branch: 3.6 parent: 104207:929e3adefe7a parent: 104209:36d37ff6c236 user: Martin Panter <vadmium+py(a)gmail.com> date: Sat Oct 01 03:11:04 2016 +0000 summary: Issue #28275: Merge bz2 fix from 3.5 into 3.6 files: Lib/test/test_bz2.py | 6 ++++++ Lib/test/test_lzma.py | 8 +++----- Misc/NEWS | 3 ++- Modules/_bz2module.c | 4 +++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -821,6 +821,12 @@ out.append(bzd.decompress(self.DATA[300:])) self.assertEqual(b''.join(out), self.TEXT) + def test_failure(self): + bzd = BZ2Decompressor() + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + class CompressDecompressTest(BaseTest): def testCompress(self): data = bz2.compress(self.TEXT) diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -249,11 +249,9 @@ def test_decompressor_bug_28275(self): # Test coverage for Issue 28275 lzd = LZMADecompressor() - for i in range(2): - try: - lzd.decompress(COMPRESSED_RAW_1) - except LZMAError: - pass + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) # Test that LZMACompressor->LZMADecompressor preserves the input data. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -67,7 +67,8 @@ that they don't call itermonthdates() which can cause datetime.date under/overflow. -- Issue #28275: Fixed possible use adter free in LZMADecompressor.decompress(). +- Issue #28275: Fixed possible use after free in the decompress() + methods of the LZMADecompressor and BZ2Decompressor classes. Original patch by John Leitch. - Issue #27897: Fixed possible crash in sqlite3.Connection.create_collation() diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -534,8 +534,10 @@ } result = decompress_buf(d, max_length); - if(result == NULL) + if(result == NULL) { + bzs->next_in = NULL; return NULL; + } if (d->eof) { d->needs_input = 0; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #28275: Merge bz2 fix from 3.6
by martin.panter Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/35b5f4cc08f4 changeset: 104211:35b5f4cc08f4 parent: 104208:013b3b5d3b6c parent: 104210:dca18f0ec280 user: Martin Panter <vadmium+py(a)gmail.com> date: Sat Oct 01 03:21:22 2016 +0000 summary: Issue #28275: Merge bz2 fix from 3.6 files: Lib/test/test_bz2.py | 6 ++++++ Lib/test/test_lzma.py | 8 +++----- Misc/NEWS | 3 ++- Modules/_bz2module.c | 4 +++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -821,6 +821,12 @@ out.append(bzd.decompress(self.DATA[300:])) self.assertEqual(b''.join(out), self.TEXT) + def test_failure(self): + bzd = BZ2Decompressor() + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(Exception, bzd.decompress, self.BAD_DATA * 30) + class CompressDecompressTest(BaseTest): def testCompress(self): data = bz2.compress(self.TEXT) diff --git a/Lib/test/test_lzma.py b/Lib/test/test_lzma.py --- a/Lib/test/test_lzma.py +++ b/Lib/test/test_lzma.py @@ -249,11 +249,9 @@ def test_decompressor_bug_28275(self): # Test coverage for Issue 28275 lzd = LZMADecompressor() - for i in range(2): - try: - lzd.decompress(COMPRESSED_RAW_1) - except LZMAError: - pass + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) + # Previously, a second call could crash due to internal inconsistency + self.assertRaises(LZMAError, lzd.decompress, COMPRESSED_RAW_1) # Test that LZMACompressor->LZMADecompressor preserves the input data. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -75,7 +75,8 @@ that they don't call itermonthdates() which can cause datetime.date under/overflow. -- Issue #28275: Fixed possible use adter free in LZMADecompressor.decompress(). +- Issue #28275: Fixed possible use after free in the decompress() + methods of the LZMADecompressor and BZ2Decompressor classes. Original patch by John Leitch. - Issue #27897: Fixed possible crash in sqlite3.Connection.create_collation() diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -534,8 +534,10 @@ } result = decompress_buf(d, max_length); - if(result == NULL) + if(result == NULL) { + bzs->next_in = NULL; return NULL; + } if (d->eof) { d->needs_input = 0; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): Issue #28228: imghdr now supports pathlib
by berker.peksag Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/929e3adefe7a changeset: 104207:929e3adefe7a branch: 3.6 parent: 104205:0fe04467c4b5 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 05:01:54 2016 +0300 summary: Issue #28228: imghdr now supports pathlib files: Doc/library/imghdr.rst | 3 +++ Lib/imghdr.py | 4 +++- Lib/test/test_imghdr.py | 7 +++++++ Misc/NEWS | 2 ++ 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst --- a/Doc/library/imghdr.rst +++ b/Doc/library/imghdr.rst @@ -20,6 +20,9 @@ string describing the image type. If optional *h* is provided, the *filename* is ignored and *h* is assumed to contain the byte stream to test. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + The following image types are recognized, as listed below with the return value from :func:`what`: diff --git a/Lib/imghdr.py b/Lib/imghdr.py --- a/Lib/imghdr.py +++ b/Lib/imghdr.py @@ -1,5 +1,7 @@ """Recognize image file formats based on their first few bytes.""" +from os import PathLike + __all__ = ["what"] #-------------------------# @@ -10,7 +12,7 @@ f = None try: if h is None: - if isinstance(file, str): + if isinstance(file, (str, PathLike)): f = open(file, 'rb') h = f.read(32) else: diff --git a/Lib/test/test_imghdr.py b/Lib/test/test_imghdr.py --- a/Lib/test/test_imghdr.py +++ b/Lib/test/test_imghdr.py @@ -1,6 +1,7 @@ import imghdr import io import os +import pathlib import unittest import warnings from test.support import findfile, TESTFN, unlink @@ -49,6 +50,12 @@ self.assertEqual(imghdr.what(None, data), expected) self.assertEqual(imghdr.what(None, bytearray(data)), expected) + def test_pathlike_filename(self): + for filename, expected in TEST_FILES: + with self.subTest(filename=filename): + filename = findfile(filename, subdir='imghdrdata') + self.assertEqual(imghdr.what(pathlib.Path(filename)), expected) + def test_register_test(self): def test_jumbo(h, file): if h.startswith(b'eggs'): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,8 @@ Library ------- +- Issue #28228: imghdr now supports pathlib. + - Issue #28226: compileall now supports pathlib. - Issue #28314: Fix function declaration (C flags) for the getiterator() method -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #28228: Merge from 3.6
by berker.peksag Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/013b3b5d3b6c changeset: 104208:013b3b5d3b6c parent: 104206:4ba2f6bce7f4 parent: 104207:929e3adefe7a user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 05:02:22 2016 +0300 summary: Issue #28228: Merge from 3.6 files: Doc/library/imghdr.rst | 3 +++ Lib/imghdr.py | 4 +++- Lib/test/test_imghdr.py | 7 +++++++ Misc/NEWS | 2 ++ 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst --- a/Doc/library/imghdr.rst +++ b/Doc/library/imghdr.rst @@ -20,6 +20,9 @@ string describing the image type. If optional *h* is provided, the *filename* is ignored and *h* is assumed to contain the byte stream to test. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + The following image types are recognized, as listed below with the return value from :func:`what`: diff --git a/Lib/imghdr.py b/Lib/imghdr.py --- a/Lib/imghdr.py +++ b/Lib/imghdr.py @@ -1,5 +1,7 @@ """Recognize image file formats based on their first few bytes.""" +from os import PathLike + __all__ = ["what"] #-------------------------# @@ -10,7 +12,7 @@ f = None try: if h is None: - if isinstance(file, str): + if isinstance(file, (str, PathLike)): f = open(file, 'rb') h = f.read(32) else: diff --git a/Lib/test/test_imghdr.py b/Lib/test/test_imghdr.py --- a/Lib/test/test_imghdr.py +++ b/Lib/test/test_imghdr.py @@ -1,6 +1,7 @@ import imghdr import io import os +import pathlib import unittest import warnings from test.support import findfile, TESTFN, unlink @@ -49,6 +50,12 @@ self.assertEqual(imghdr.what(None, data), expected) self.assertEqual(imghdr.what(None, bytearray(data)), expected) + def test_pathlike_filename(self): + for filename, expected in TEST_FILES: + with self.subTest(filename=filename): + filename = findfile(filename, subdir='imghdrdata') + self.assertEqual(imghdr.what(pathlib.Path(filename)), expected) + def test_register_test(self): def test_jumbo(h, file): if h.startswith(b'eggs'): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -54,6 +54,8 @@ Library ------- +- Issue #28228: imghdr now supports pathlib. + - Issue #28226: compileall now supports pathlib. - Issue #28314: Fix function declaration (C flags) for the getiterator() method -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Issue #28283: Merge from 3.5
by berker.peksag Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/0fe04467c4b5 changeset: 104205:0fe04467c4b5 branch: 3.6 parent: 104202:13cd90bdcfbe parent: 104204:f7688db81753 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 04:17:33 2016 +0300 summary: Issue #28283: Merge from 3.5 files: Lib/test/test_asyncio/test_selector_events.py | 86 ---------- 1 files changed, 0 insertions(+), 86 deletions(-) diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -2,8 +2,6 @@ import errno import socket -import threading -import time import unittest from unittest import mock try: @@ -1786,89 +1784,5 @@ 'Fatal error on transport\nprotocol:.*\ntransport:.*'), exc_info=(ConnectionRefusedError, MOCK_ANY, MOCK_ANY)) - -class SelectorLoopFunctionalTests(unittest.TestCase): - - def setUp(self): - self.loop = asyncio.new_event_loop() - asyncio.set_event_loop(None) - - def tearDown(self): - self.loop.close() - - @asyncio.coroutine - def recv_all(self, sock, nbytes): - buf = b'' - while len(buf) < nbytes: - buf += yield from self.loop.sock_recv(sock, nbytes - len(buf)) - return buf - - def test_sock_connect_sock_write_race(self): - TIMEOUT = 3.0 - PAYLOAD = b'DATA' * 1024 * 1024 - - class Server(threading.Thread): - def __init__(self, *args, srv_sock, **kwargs): - super().__init__(*args, **kwargs) - self.srv_sock = srv_sock - - def run(self): - with self.srv_sock: - srv_sock.listen(100) - - sock, addr = self.srv_sock.accept() - sock.settimeout(TIMEOUT) - - with sock: - sock.sendall(b'helo') - - buf = bytearray() - while len(buf) < len(PAYLOAD): - pack = sock.recv(1024 * 65) - if not pack: - break - buf.extend(pack) - - @asyncio.coroutine - def client(addr): - sock = socket.socket() - with sock: - sock.setblocking(False) - - started = time.monotonic() - while True: - if time.monotonic() - started > TIMEOUT: - self.fail('unable to connect to the socket') - return - try: - yield from self.loop.sock_connect(sock, addr) - except OSError: - yield from asyncio.sleep(0.05, loop=self.loop) - else: - break - - # Give 'Server' thread a chance to accept and send b'helo' - time.sleep(0.1) - - data = yield from self.recv_all(sock, 4) - self.assertEqual(data, b'helo') - yield from self.loop.sock_sendall(sock, PAYLOAD) - - srv_sock = socket.socket() - srv_sock.settimeout(TIMEOUT) - srv_sock.bind(('127.0.0.1', 0)) - srv_addr = srv_sock.getsockname() - - srv = Server(srv_sock=srv_sock, daemon=True) - srv.start() - - try: - self.loop.run_until_complete( - asyncio.wait_for(client(srv_addr), loop=self.loop, - timeout=TIMEOUT)) - finally: - srv.join() - - if __name__ == '__main__': unittest.main() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #28283: Merge from 3.6
by berker.peksag Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/4ba2f6bce7f4 changeset: 104206:4ba2f6bce7f4 parent: 104203:ff80d77200ed parent: 104205:0fe04467c4b5 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 04:17:56 2016 +0300 summary: Issue #28283: Merge from 3.6 files: Lib/test/test_asyncio/test_selector_events.py | 86 ---------- 1 files changed, 0 insertions(+), 86 deletions(-) diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -2,8 +2,6 @@ import errno import socket -import threading -import time import unittest from unittest import mock try: @@ -1786,89 +1784,5 @@ 'Fatal error on transport\nprotocol:.*\ntransport:.*'), exc_info=(ConnectionRefusedError, MOCK_ANY, MOCK_ANY)) - -class SelectorLoopFunctionalTests(unittest.TestCase): - - def setUp(self): - self.loop = asyncio.new_event_loop() - asyncio.set_event_loop(None) - - def tearDown(self): - self.loop.close() - - @asyncio.coroutine - def recv_all(self, sock, nbytes): - buf = b'' - while len(buf) < nbytes: - buf += yield from self.loop.sock_recv(sock, nbytes - len(buf)) - return buf - - def test_sock_connect_sock_write_race(self): - TIMEOUT = 3.0 - PAYLOAD = b'DATA' * 1024 * 1024 - - class Server(threading.Thread): - def __init__(self, *args, srv_sock, **kwargs): - super().__init__(*args, **kwargs) - self.srv_sock = srv_sock - - def run(self): - with self.srv_sock: - srv_sock.listen(100) - - sock, addr = self.srv_sock.accept() - sock.settimeout(TIMEOUT) - - with sock: - sock.sendall(b'helo') - - buf = bytearray() - while len(buf) < len(PAYLOAD): - pack = sock.recv(1024 * 65) - if not pack: - break - buf.extend(pack) - - @asyncio.coroutine - def client(addr): - sock = socket.socket() - with sock: - sock.setblocking(False) - - started = time.monotonic() - while True: - if time.monotonic() - started > TIMEOUT: - self.fail('unable to connect to the socket') - return - try: - yield from self.loop.sock_connect(sock, addr) - except OSError: - yield from asyncio.sleep(0.05, loop=self.loop) - else: - break - - # Give 'Server' thread a chance to accept and send b'helo' - time.sleep(0.1) - - data = yield from self.recv_all(sock, 4) - self.assertEqual(data, b'helo') - yield from self.loop.sock_sendall(sock, PAYLOAD) - - srv_sock = socket.socket() - srv_sock.settimeout(TIMEOUT) - srv_sock.bind(('127.0.0.1', 0)) - srv_addr = srv_sock.getsockname() - - srv = Server(srv_sock=srv_sock, daemon=True) - srv.start() - - try: - self.loop.run_until_complete( - asyncio.wait_for(client(srv_addr), loop=self.loop, - timeout=TIMEOUT)) - finally: - srv.join() - - if __name__ == '__main__': unittest.main() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #28283: Remove flaky test test_sock_connect_sock_write_race again
by berker.peksag Oct. 1, 2016

Oct. 1, 2016

https://hg.python.org/cpython/rev/f7688db81753 changeset: 104204:f7688db81753 branch: 3.5 parent: 104199:258436eecb51 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 04:16:59 2016 +0300 summary: Issue #28283: Remove flaky test test_sock_connect_sock_write_race again It was added back in 53a578f51f21. files: Lib/test/test_asyncio/test_selector_events.py | 86 ---------- 1 files changed, 0 insertions(+), 86 deletions(-) diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -2,8 +2,6 @@ import errno import socket -import threading -import time import unittest from unittest import mock try: @@ -1786,89 +1784,5 @@ 'Fatal error on transport\nprotocol:.*\ntransport:.*'), exc_info=(ConnectionRefusedError, MOCK_ANY, MOCK_ANY)) - -class SelectorLoopFunctionalTests(unittest.TestCase): - - def setUp(self): - self.loop = asyncio.new_event_loop() - asyncio.set_event_loop(None) - - def tearDown(self): - self.loop.close() - - @asyncio.coroutine - def recv_all(self, sock, nbytes): - buf = b'' - while len(buf) < nbytes: - buf += yield from self.loop.sock_recv(sock, nbytes - len(buf)) - return buf - - def test_sock_connect_sock_write_race(self): - TIMEOUT = 3.0 - PAYLOAD = b'DATA' * 1024 * 1024 - - class Server(threading.Thread): - def __init__(self, *args, srv_sock, **kwargs): - super().__init__(*args, **kwargs) - self.srv_sock = srv_sock - - def run(self): - with self.srv_sock: - srv_sock.listen(100) - - sock, addr = self.srv_sock.accept() - sock.settimeout(TIMEOUT) - - with sock: - sock.sendall(b'helo') - - buf = bytearray() - while len(buf) < len(PAYLOAD): - pack = sock.recv(1024 * 65) - if not pack: - break - buf.extend(pack) - - @asyncio.coroutine - def client(addr): - sock = socket.socket() - with sock: - sock.setblocking(False) - - started = time.monotonic() - while True: - if time.monotonic() - started > TIMEOUT: - self.fail('unable to connect to the socket') - return - try: - yield from self.loop.sock_connect(sock, addr) - except OSError: - yield from asyncio.sleep(0.05, loop=self.loop) - else: - break - - # Give 'Server' thread a chance to accept and send b'helo' - time.sleep(0.1) - - data = yield from self.recv_all(sock, 4) - self.assertEqual(data, b'helo') - yield from self.loop.sock_sendall(sock, PAYLOAD) - - srv_sock = socket.socket() - srv_sock.settimeout(TIMEOUT) - srv_sock.bind(('127.0.0.1', 0)) - srv_addr = srv_sock.getsockname() - - srv = Server(srv_sock=srv_sock, daemon=True) - srv.start() - - try: - self.loop.run_until_complete( - asyncio.wait_for(client(srv_addr), loop=self.loop, - timeout=TIMEOUT)) - finally: - srv.join() - - if __name__ == '__main__': unittest.main() -- Repository URL: https://hg.python.org/cpython

1 0