Mailman 3 September 2016 - Python-checkins

cpython (merge 3.5 -> 3.6): Merge from 3.5
by berker.peksag Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/6c42aeafbf0c changeset: 104194:6c42aeafbf0c branch: 3.6 parent: 104191:a6f0cc1820f4 parent: 104193:abbf12ea20c0 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 01:03:01 2016 +0300 summary: Merge from 3.5 files: Doc/library/pathlib.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst --- a/Doc/library/pathlib.rst +++ b/Doc/library/pathlib.rst @@ -943,7 +943,7 @@ .. method:: Path.rglob(pattern) - This is like calling :meth:`glob` with "``**``" added in front of the + This is like calling :meth:`Path.glob` with "``**``" added in front of the given *pattern*: >>> sorted(Path().rglob("*.py")) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #28226: Merge from 3.6
by berker.peksag Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/fcce24bc9416 changeset: 104192:fcce24bc9416 parent: 104190:89cc2a6b64aa parent: 104191:a6f0cc1820f4 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 00:54:55 2016 +0300 summary: Issue #28226: Merge from 3.6 files: Doc/library/compileall.rst | 6 ++++++ Lib/compileall.py | 4 ++++ Lib/test/test_compileall.py | 23 +++++++++++++++++++++++ Misc/NEWS | 2 ++ 4 files changed, 35 insertions(+), 0 deletions(-) diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst --- a/Doc/library/compileall.rst +++ b/Doc/library/compileall.rst @@ -153,6 +153,9 @@ The *legacy* parameter only writes out ``.pyc`` files, not ``.pyo`` files no matter what the value of *optimize* is. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, legacy=False, optimize=-1) Compile the file with path *fullname*. Return a true value if the file @@ -221,6 +224,9 @@ import re compileall.compile_dir('Lib/', rx=re.compile(r'[/\\][.]svn'), force=True) + # pathlib.Path objects can also be used. + import pathlib + compileall.compile_dir(pathlib.Path('Lib/'), force=True) .. seealso:: diff --git a/Lib/compileall.py b/Lib/compileall.py --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -25,6 +25,8 @@ __all__ = ["compile_dir","compile_file","compile_path"] def _walk_dir(dir, ddir=None, maxlevels=10, quiet=0): + if quiet < 2 and isinstance(dir, os.PathLike): + dir = os.fspath(dir) if not quiet: print('Listing {!r}...'.format(dir)) try: @@ -105,6 +107,8 @@ optimize: optimization level or -1 for level of the interpreter """ success = True + if quiet < 2 and isinstance(fullname, os.PathLike): + fullname = os.fspath(fullname) name = os.path.basename(fullname) if ddir is not None: dfile = os.path.join(ddir, name) diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py --- a/Lib/test/test_compileall.py +++ b/Lib/test/test_compileall.py @@ -102,6 +102,22 @@ self.assertFalse(compileall.compile_dir(self.directory, force=False, quiet=2)) + def test_compile_file_pathlike(self): + self.assertFalse(os.path.isfile(self.bc_path)) + # we should also test the output + with support.captured_stdout() as stdout: + self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path))) + self.assertEqual(stdout.getvalue(), + "Compiling '{}'...\n".format(self.source_path)) + self.assertTrue(os.path.isfile(self.bc_path)) + + def test_compile_file_pathlike_ddir(self): + self.assertFalse(os.path.isfile(self.bc_path)) + self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path), + ddir=pathlib.Path('ddir_path'), + quiet=2)) + self.assertTrue(os.path.isfile(self.bc_path)) + def test_compile_path(self): with test.test_importlib.util.import_state(path=[self.directory]): self.assertTrue(compileall.compile_path(quiet=2)) @@ -138,6 +154,13 @@ optimization=opt) self.assertTrue(os.path.isfile(cached3)) + def test_compile_dir_pathlike(self): + self.assertFalse(os.path.isfile(self.bc_path)) + with support.captured_stdout() as stdout: + compileall.compile_dir(pathlib.Path(self.directory)) + self.assertIn("Listing '{}'...".format(self.directory), stdout.getvalue()) + self.assertTrue(os.path.isfile(self.bc_path)) + @mock.patch('compileall.ProcessPoolExecutor') def test_compile_pool_called(self, pool_mock): compileall.compile_dir(self.directory, quiet=True, workers=5) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -54,6 +54,8 @@ Library ------- +- Issue #28226: compileall now supports pathlib. + - Issue #28314: Fix function declaration (C flags) for the getiterator() method of xml.etree.ElementTree.Element. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.6): Issue #28226: compileall now supports pathlib
by berker.peksag Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/a6f0cc1820f4 changeset: 104191:a6f0cc1820f4 branch: 3.6 parent: 104189:c729a62d4ec5 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sat Oct 01 00:54:18 2016 +0300 summary: Issue #28226: compileall now supports pathlib files: Doc/library/compileall.rst | 6 ++++++ Lib/compileall.py | 4 ++++ Lib/test/test_compileall.py | 23 +++++++++++++++++++++++ Misc/NEWS | 2 ++ 4 files changed, 35 insertions(+), 0 deletions(-) diff --git a/Doc/library/compileall.rst b/Doc/library/compileall.rst --- a/Doc/library/compileall.rst +++ b/Doc/library/compileall.rst @@ -153,6 +153,9 @@ The *legacy* parameter only writes out ``.pyc`` files, not ``.pyo`` files no matter what the value of *optimize* is. + .. versionchanged:: 3.6 + Accepts a :term:`path-like object`. + .. function:: compile_file(fullname, ddir=None, force=False, rx=None, quiet=0, legacy=False, optimize=-1) Compile the file with path *fullname*. Return a true value if the file @@ -221,6 +224,9 @@ import re compileall.compile_dir('Lib/', rx=re.compile(r'[/\\][.]svn'), force=True) + # pathlib.Path objects can also be used. + import pathlib + compileall.compile_dir(pathlib.Path('Lib/'), force=True) .. seealso:: diff --git a/Lib/compileall.py b/Lib/compileall.py --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -25,6 +25,8 @@ __all__ = ["compile_dir","compile_file","compile_path"] def _walk_dir(dir, ddir=None, maxlevels=10, quiet=0): + if quiet < 2 and isinstance(dir, os.PathLike): + dir = os.fspath(dir) if not quiet: print('Listing {!r}...'.format(dir)) try: @@ -105,6 +107,8 @@ optimize: optimization level or -1 for level of the interpreter """ success = True + if quiet < 2 and isinstance(fullname, os.PathLike): + fullname = os.fspath(fullname) name = os.path.basename(fullname) if ddir is not None: dfile = os.path.join(ddir, name) diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py --- a/Lib/test/test_compileall.py +++ b/Lib/test/test_compileall.py @@ -102,6 +102,22 @@ self.assertFalse(compileall.compile_dir(self.directory, force=False, quiet=2)) + def test_compile_file_pathlike(self): + self.assertFalse(os.path.isfile(self.bc_path)) + # we should also test the output + with support.captured_stdout() as stdout: + self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path))) + self.assertEqual(stdout.getvalue(), + "Compiling '{}'...\n".format(self.source_path)) + self.assertTrue(os.path.isfile(self.bc_path)) + + def test_compile_file_pathlike_ddir(self): + self.assertFalse(os.path.isfile(self.bc_path)) + self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path), + ddir=pathlib.Path('ddir_path'), + quiet=2)) + self.assertTrue(os.path.isfile(self.bc_path)) + def test_compile_path(self): with test.test_importlib.util.import_state(path=[self.directory]): self.assertTrue(compileall.compile_path(quiet=2)) @@ -138,6 +154,13 @@ optimization=opt) self.assertTrue(os.path.isfile(cached3)) + def test_compile_dir_pathlike(self): + self.assertFalse(os.path.isfile(self.bc_path)) + with support.captured_stdout() as stdout: + compileall.compile_dir(pathlib.Path(self.directory)) + self.assertIn("Listing '{}'...".format(self.directory), stdout.getvalue()) + self.assertTrue(os.path.isfile(self.bc_path)) + @mock.patch('compileall.ProcessPoolExecutor') def test_compile_pool_called(self, pool_mock): compileall.compile_dir(self.directory, quiet=True, workers=5) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,8 @@ Library ------- +- Issue #28226: compileall now supports pathlib. + - Issue #28314: Fix function declaration (C flags) for the getiterator() method of xml.etree.ElementTree.Element. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Merge with 3.5
by terry.reedy Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/c729a62d4ec5 changeset: 104189:c729a62d4ec5 branch: 3.6 parent: 104185:9414235b8e60 parent: 104188:1bead1f0260f user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Sep 30 15:39:05 2016 -0400 summary: Merge with 3.5 files: Doc/tutorial/errors.rst | 16 ++++++++-------- Misc/ACKS | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -18,7 +18,7 @@ complaint you get while you are still learning Python:: >>> while True print('Hello world') - File "<stdin>", line 1, in ? + File "<stdin>", line 1 while True print('Hello world') ^ SyntaxError: invalid syntax @@ -44,15 +44,15 @@ >>> 10 * (1/0) Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> ZeroDivisionError: division by zero >>> 4 + spam*3 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: name 'spam' is not defined >>> '2' + 2 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> TypeError: Can't convert 'int' object to str implicitly The last line of the error message indicates what happened. Exceptions come in @@ -214,7 +214,7 @@ >>> raise NameError('HiThere') Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: HiThere The sole argument to :keyword:`raise` indicates the exception to be raised. @@ -233,7 +233,7 @@ ... An exception flew by! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> NameError: HiThere @@ -308,7 +308,7 @@ ... Goodbye, world! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> KeyboardInterrupt A *finally clause* is always executed before leaving the :keyword:`try` @@ -340,7 +340,7 @@ >>> divide("2", "1") executing finally clause Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> File "<stdin>", line 3, in divide TypeError: unsupported operand type(s) for /: 'str' and 'str' diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1621,6 +1621,7 @@ Felix Wiemann Gerry Wiener Frank Wierzbicki +Mariatta Wijaya Santoso Wijaya Chris Wilcox Bryce "Zooko" Wilcox-O'Hearn -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Merge with 3.6
by terry.reedy Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/89cc2a6b64aa changeset: 104190:89cc2a6b64aa parent: 104186:03dfe0e81864 parent: 104189:c729a62d4ec5 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Sep 30 15:39:22 2016 -0400 summary: Merge with 3.6 files: Doc/tutorial/errors.rst | 16 ++++++++-------- Misc/ACKS | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -18,7 +18,7 @@ complaint you get while you are still learning Python:: >>> while True print('Hello world') - File "<stdin>", line 1, in ? + File "<stdin>", line 1 while True print('Hello world') ^ SyntaxError: invalid syntax @@ -44,15 +44,15 @@ >>> 10 * (1/0) Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> ZeroDivisionError: division by zero >>> 4 + spam*3 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: name 'spam' is not defined >>> '2' + 2 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> TypeError: Can't convert 'int' object to str implicitly The last line of the error message indicates what happened. Exceptions come in @@ -214,7 +214,7 @@ >>> raise NameError('HiThere') Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: HiThere The sole argument to :keyword:`raise` indicates the exception to be raised. @@ -233,7 +233,7 @@ ... An exception flew by! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> NameError: HiThere @@ -308,7 +308,7 @@ ... Goodbye, world! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> KeyboardInterrupt A *finally clause* is always executed before leaving the :keyword:`try` @@ -340,7 +340,7 @@ >>> divide("2", "1") executing finally clause Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> File "<stdin>", line 3, in divide TypeError: unsupported operand type(s) for /: 'str' and 'str' diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1622,6 +1622,7 @@ Felix Wiemann Gerry Wiener Frank Wierzbicki +Mariatta Wijaya Santoso Wijaya Chris Wilcox Bryce "Zooko" Wilcox-O'Hearn -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #28815: Change '?' to '<module>' in some doc examples.
by terry.reedy Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/1bead1f0260f changeset: 104188:1bead1f0260f branch: 3.5 parent: 104184:53a578f51f21 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Sep 30 15:38:48 2016 -0400 summary: Issue #28815: Change '?' to '<module>' in some doc examples. Patch by Mariatta Wijaya. files: Doc/tutorial/errors.rst | 16 ++++++++-------- Misc/ACKS | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -18,7 +18,7 @@ complaint you get while you are still learning Python:: >>> while True print('Hello world') - File "<stdin>", line 1, in ? + File "<stdin>", line 1 while True print('Hello world') ^ SyntaxError: invalid syntax @@ -44,15 +44,15 @@ >>> 10 * (1/0) Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> ZeroDivisionError: division by zero >>> 4 + spam*3 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: name 'spam' is not defined >>> '2' + 2 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> TypeError: Can't convert 'int' object to str implicitly The last line of the error message indicates what happened. Exceptions come in @@ -214,7 +214,7 @@ >>> raise NameError('HiThere') Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: HiThere The sole argument to :keyword:`raise` indicates the exception to be raised. @@ -233,7 +233,7 @@ ... An exception flew by! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> NameError: HiThere @@ -308,7 +308,7 @@ ... Goodbye, world! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> KeyboardInterrupt A *finally clause* is always executed before leaving the :keyword:`try` @@ -340,7 +340,7 @@ >>> divide("2", "1") executing finally clause Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> File "<stdin>", line 3, in divide TypeError: unsupported operand type(s) for /: 'str' and 'str' diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1595,6 +1595,7 @@ Felix Wiemann Gerry Wiener Frank Wierzbicki +Mariatta Wijaya Santoso Wijaya Chris Wilcox Bryce "Zooko" Wilcox-O'Hearn -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #28815: Change '?' to '<module>' in some doc examples.
by terry.reedy Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/ce57a74b5223 changeset: 104187:ce57a74b5223 branch: 2.7 parent: 104178:7cea3bf44acb user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Sep 30 15:38:41 2016 -0400 summary: Issue #28815: Change '?' to '<module>' in some doc examples. Patch by Mariatta Wijaya. files: Doc/tutorial/errors.rst | 18 +++++++++--------- Misc/ACKS | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -18,7 +18,7 @@ complaint you get while you are still learning Python:: >>> while True print 'Hello world' - File "<stdin>", line 1, in ? + File "<stdin>", line 1 while True print 'Hello world' ^ SyntaxError: invalid syntax @@ -44,15 +44,15 @@ >>> 10 * (1/0) Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> ZeroDivisionError: integer division or modulo by zero >>> 4 + spam*3 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: name 'spam' is not defined >>> '2' + 2 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> TypeError: cannot concatenate 'str' and 'int' objects The last line of the error message indicates what happened. Exceptions come in @@ -223,7 +223,7 @@ >>> raise NameError('HiThere') Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: HiThere The sole argument to :keyword:`raise` indicates the exception to be raised. @@ -242,7 +242,7 @@ ... An exception flew by! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> NameError: HiThere @@ -270,7 +270,7 @@ My exception occurred, value: 4 >>> raise MyError('oops!') Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> __main__.MyError: 'oops!' In this example, the default :meth:`__init__` of :class:`Exception` has been @@ -339,7 +339,7 @@ ... Goodbye, world! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> KeyboardInterrupt A *finally clause* is always executed before leaving the :keyword:`try` @@ -372,7 +372,7 @@ >>> divide("2", "1") executing finally clause Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> File "<stdin>", line 3, in divide TypeError: unsupported operand type(s) for /: 'str' and 'str' diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1494,6 +1494,7 @@ Felix Wiemann Gerry Wiener Frank Wierzbicki +Mariatta Wijaya Santoso Wijaya Bryce "Zooko" Wilcox-O'Hearn Timothy Wild -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Misc asyncio improvements from upstream (merge 3.6->3.7)
by guido.van.rossum Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/03dfe0e81864 changeset: 104186:03dfe0e81864 parent: 104183:778e4bc7bc77 parent: 104185:9414235b8e60 user: Guido van Rossum <guido(a)python.org> date: Fri Sep 30 08:19:09 2016 -0700 summary: Misc asyncio improvements from upstream (merge 3.6->3.7) files: Lib/asyncio/base_events.py | 28 +-- Lib/asyncio/base_subprocess.py | 1 - Lib/asyncio/coroutines.py | 4 +- Lib/asyncio/queues.py | 1 - Lib/asyncio/tasks.py | 4 + Lib/test/test_asyncio/test_base_events.py | 51 +++-- Lib/test/test_asyncio/test_selector_events.py | 86 ++++++++++ Lib/test/test_asyncio/test_tasks.py | 31 +++ 8 files changed, 164 insertions(+), 42 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -115,24 +115,16 @@ if port is None: port = 0 - elif isinstance(port, bytes): - if port == b'': - port = 0 - else: - try: - port = int(port) - except ValueError: - # Might be a service name like b"http". - port = socket.getservbyname(port.decode('ascii')) - elif isinstance(port, str): - if port == '': - port = 0 - else: - try: - port = int(port) - except ValueError: - # Might be a service name like "http". - port = socket.getservbyname(port) + elif isinstance(port, bytes) and port == b'': + port = 0 + elif isinstance(port, str) and port == '': + port = 0 + else: + # If port's a service name like "http", don't skip getaddrinfo. + try: + port = int(port) + except (TypeError, ValueError): + return None if family == socket.AF_UNSPEC: afs = [socket.AF_INET, socket.AF_INET6] diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -3,7 +3,6 @@ import warnings from . import compat -from . import futures from . import protocols from . import transports from .coroutines import coroutine diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -120,8 +120,8 @@ def send(self, value): return self.gen.send(value) - def throw(self, exc): - return self.gen.throw(exc) + def throw(self, type, value=None, traceback=None): + return self.gen.throw(type, value, traceback) def close(self): return self.gen.close() diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -7,7 +7,6 @@ from . import compat from . import events -from . import futures from . import locks from .coroutines import coroutine diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -594,6 +594,10 @@ """Return a future aggregating results from the given coroutines or futures. + Coroutines will be wrapped in a future and scheduled in the event + loop. They will not necessarily be scheduled in the same order as + passed in. + All futures must share the same event loop. If all the tasks are done successfully, the returned future's result is the list of results (in the order of the original sequence, not necessarily 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 @@ -142,26 +142,6 @@ (INET, STREAM, TCP, '', ('1.2.3.4', 1)), base_events._ipaddr_info('1.2.3.4', b'1', INET, STREAM, TCP)) - def test_getaddrinfo_servname(self): - INET = socket.AF_INET - STREAM = socket.SOCK_STREAM - TCP = socket.IPPROTO_TCP - - self.assertEqual( - (INET, STREAM, TCP, '', ('1.2.3.4', 80)), - base_events._ipaddr_info('1.2.3.4', 'http', INET, STREAM, TCP)) - - self.assertEqual( - (INET, STREAM, TCP, '', ('1.2.3.4', 80)), - base_events._ipaddr_info('1.2.3.4', b'http', INET, STREAM, TCP)) - - # Raises "service/proto not found". - with self.assertRaises(OSError): - base_events._ipaddr_info('1.2.3.4', 'nonsense', INET, STREAM, TCP) - - with self.assertRaises(OSError): - base_events._ipaddr_info('1.2.3.4', 'nonsense', INET, STREAM, TCP) - @patch_socket def test_ipaddr_info_no_inet_pton(self, m_socket): del m_socket.inet_pton @@ -1209,6 +1189,37 @@ def test_create_connection_no_inet_pton(self, m_socket): self._test_create_connection_ip_addr(m_socket, False) + @patch_socket + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value + + self.loop.add_reader = mock.Mock() + self.loop.add_reader._is_coroutine = False + self.loop.add_writer = mock.Mock() + self.loop.add_writer._is_coroutine = False + + for service, port in ('http', 80), (b'http', 80): + coro = self.loop.create_connection(asyncio.Protocol, + '127.0.0.1', service) + + t, p = self.loop.run_until_complete(coro) + try: + sock.connect.assert_called_with(('127.0.0.1', port)) + _, kwargs = m_socket.socket.call_args + self.assertEqual(kwargs['family'], m_socket.AF_INET) + self.assertEqual(kwargs['type'], m_socket.SOCK_STREAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close + + for service in 'nonsense', b'nonsense': + coro = self.loop.create_connection(asyncio.Protocol, + '127.0.0.1', service) + + with self.assertRaises(OSError): + self.loop.run_until_complete(coro) + def test_create_connection_no_local_addr(self): @asyncio.coroutine def getaddrinfo(host, *args, **kw): 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,6 +2,8 @@ import errno import socket +import threading +import time import unittest from unittest import mock try: @@ -1784,5 +1786,89 @@ '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() diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1723,6 +1723,37 @@ wd['cw'] = cw # Would fail without __weakref__ slot. cw.gen = None # Suppress warning from __del__. + def test_corowrapper_throw(self): + # Issue 429: CoroWrapper.throw must be compatible with gen.throw + def foo(): + value = None + while True: + try: + value = yield value + except Exception as e: + value = e + + exception = Exception("foo") + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + self.assertIs(exception, cw.throw(exception)) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + self.assertIs(exception, cw.throw(Exception, exception)) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + exception = cw.throw(Exception, "foo") + self.assertIsInstance(exception, Exception) + self.assertEqual(exception.args, ("foo", )) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + exception = cw.throw(Exception, "foo", None) + self.assertIsInstance(exception, Exception) + self.assertEqual(exception.args, ("foo", )) + @unittest.skipUnless(PY34, 'need python 3.4 or later') def test_log_destroyed_pending_task(self): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Misc asyncio improvements from upstream (merge 3.5->3.6)
by guido.van.rossum Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/9414235b8e60 changeset: 104185:9414235b8e60 branch: 3.6 parent: 104182:0c55b9eda602 parent: 104184:53a578f51f21 user: Guido van Rossum <guido(a)python.org> date: Fri Sep 30 08:18:34 2016 -0700 summary: Misc asyncio improvements from upstream (merge 3.5->3.6) files: Lib/asyncio/base_events.py | 28 +-- Lib/asyncio/base_subprocess.py | 1 - Lib/asyncio/coroutines.py | 4 +- Lib/asyncio/queues.py | 1 - Lib/asyncio/tasks.py | 4 + Lib/test/test_asyncio/test_base_events.py | 51 +++-- Lib/test/test_asyncio/test_selector_events.py | 86 ++++++++++ Lib/test/test_asyncio/test_tasks.py | 31 +++ 8 files changed, 164 insertions(+), 42 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -115,24 +115,16 @@ if port is None: port = 0 - elif isinstance(port, bytes): - if port == b'': - port = 0 - else: - try: - port = int(port) - except ValueError: - # Might be a service name like b"http". - port = socket.getservbyname(port.decode('ascii')) - elif isinstance(port, str): - if port == '': - port = 0 - else: - try: - port = int(port) - except ValueError: - # Might be a service name like "http". - port = socket.getservbyname(port) + elif isinstance(port, bytes) and port == b'': + port = 0 + elif isinstance(port, str) and port == '': + port = 0 + else: + # If port's a service name like "http", don't skip getaddrinfo. + try: + port = int(port) + except (TypeError, ValueError): + return None if family == socket.AF_UNSPEC: afs = [socket.AF_INET, socket.AF_INET6] diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -3,7 +3,6 @@ import warnings from . import compat -from . import futures from . import protocols from . import transports from .coroutines import coroutine diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -120,8 +120,8 @@ def send(self, value): return self.gen.send(value) - def throw(self, exc): - return self.gen.throw(exc) + def throw(self, type, value=None, traceback=None): + return self.gen.throw(type, value, traceback) def close(self): return self.gen.close() diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -7,7 +7,6 @@ from . import compat from . import events -from . import futures from . import locks from .coroutines import coroutine diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -594,6 +594,10 @@ """Return a future aggregating results from the given coroutines or futures. + Coroutines will be wrapped in a future and scheduled in the event + loop. They will not necessarily be scheduled in the same order as + passed in. + All futures must share the same event loop. If all the tasks are done successfully, the returned future's result is the list of results (in the order of the original sequence, not necessarily 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 @@ -142,26 +142,6 @@ (INET, STREAM, TCP, '', ('1.2.3.4', 1)), base_events._ipaddr_info('1.2.3.4', b'1', INET, STREAM, TCP)) - def test_getaddrinfo_servname(self): - INET = socket.AF_INET - STREAM = socket.SOCK_STREAM - TCP = socket.IPPROTO_TCP - - self.assertEqual( - (INET, STREAM, TCP, '', ('1.2.3.4', 80)), - base_events._ipaddr_info('1.2.3.4', 'http', INET, STREAM, TCP)) - - self.assertEqual( - (INET, STREAM, TCP, '', ('1.2.3.4', 80)), - base_events._ipaddr_info('1.2.3.4', b'http', INET, STREAM, TCP)) - - # Raises "service/proto not found". - with self.assertRaises(OSError): - base_events._ipaddr_info('1.2.3.4', 'nonsense', INET, STREAM, TCP) - - with self.assertRaises(OSError): - base_events._ipaddr_info('1.2.3.4', 'nonsense', INET, STREAM, TCP) - @patch_socket def test_ipaddr_info_no_inet_pton(self, m_socket): del m_socket.inet_pton @@ -1209,6 +1189,37 @@ def test_create_connection_no_inet_pton(self, m_socket): self._test_create_connection_ip_addr(m_socket, False) + @patch_socket + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value + + self.loop.add_reader = mock.Mock() + self.loop.add_reader._is_coroutine = False + self.loop.add_writer = mock.Mock() + self.loop.add_writer._is_coroutine = False + + for service, port in ('http', 80), (b'http', 80): + coro = self.loop.create_connection(asyncio.Protocol, + '127.0.0.1', service) + + t, p = self.loop.run_until_complete(coro) + try: + sock.connect.assert_called_with(('127.0.0.1', port)) + _, kwargs = m_socket.socket.call_args + self.assertEqual(kwargs['family'], m_socket.AF_INET) + self.assertEqual(kwargs['type'], m_socket.SOCK_STREAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close + + for service in 'nonsense', b'nonsense': + coro = self.loop.create_connection(asyncio.Protocol, + '127.0.0.1', service) + + with self.assertRaises(OSError): + self.loop.run_until_complete(coro) + def test_create_connection_no_local_addr(self): @asyncio.coroutine def getaddrinfo(host, *args, **kw): 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,6 +2,8 @@ import errno import socket +import threading +import time import unittest from unittest import mock try: @@ -1784,5 +1786,89 @@ '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() diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1723,6 +1723,37 @@ wd['cw'] = cw # Would fail without __weakref__ slot. cw.gen = None # Suppress warning from __del__. + def test_corowrapper_throw(self): + # Issue 429: CoroWrapper.throw must be compatible with gen.throw + def foo(): + value = None + while True: + try: + value = yield value + except Exception as e: + value = e + + exception = Exception("foo") + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + self.assertIs(exception, cw.throw(exception)) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + self.assertIs(exception, cw.throw(Exception, exception)) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + exception = cw.throw(Exception, "foo") + self.assertIsInstance(exception, Exception) + self.assertEqual(exception.args, ("foo", )) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + exception = cw.throw(Exception, "foo", None) + self.assertIsInstance(exception, Exception) + self.assertEqual(exception.args, ("foo", )) + @unittest.skipUnless(PY34, 'need python 3.4 or later') def test_log_destroyed_pending_task(self): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Misc asyncio improvements from upstream
by guido.van.rossum Sept. 30, 2016

Sept. 30, 2016

https://hg.python.org/cpython/rev/53a578f51f21 changeset: 104184:53a578f51f21 branch: 3.5 parent: 104179:f4754416a726 user: Guido van Rossum <guido(a)python.org> date: Fri Sep 30 08:17:15 2016 -0700 summary: Misc asyncio improvements from upstream files: Lib/asyncio/base_events.py | 28 +-- Lib/asyncio/base_subprocess.py | 1 - Lib/asyncio/coroutines.py | 4 +- Lib/asyncio/queues.py | 1 - Lib/asyncio/tasks.py | 4 + Lib/test/test_asyncio/test_base_events.py | 51 +++-- Lib/test/test_asyncio/test_selector_events.py | 86 ++++++++++ Lib/test/test_asyncio/test_tasks.py | 31 +++ 8 files changed, 164 insertions(+), 42 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -115,24 +115,16 @@ if port is None: port = 0 - elif isinstance(port, bytes): - if port == b'': - port = 0 - else: - try: - port = int(port) - except ValueError: - # Might be a service name like b"http". - port = socket.getservbyname(port.decode('ascii')) - elif isinstance(port, str): - if port == '': - port = 0 - else: - try: - port = int(port) - except ValueError: - # Might be a service name like "http". - port = socket.getservbyname(port) + elif isinstance(port, bytes) and port == b'': + port = 0 + elif isinstance(port, str) and port == '': + port = 0 + else: + # If port's a service name like "http", don't skip getaddrinfo. + try: + port = int(port) + except (TypeError, ValueError): + return None if family == socket.AF_UNSPEC: afs = [socket.AF_INET, socket.AF_INET6] diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -3,7 +3,6 @@ import warnings from . import compat -from . import futures from . import protocols from . import transports from .coroutines import coroutine diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -120,8 +120,8 @@ def send(self, value): return self.gen.send(value) - def throw(self, exc): - return self.gen.throw(exc) + def throw(self, type, value=None, traceback=None): + return self.gen.throw(type, value, traceback) def close(self): return self.gen.close() diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -7,7 +7,6 @@ from . import compat from . import events -from . import futures from . import locks from .coroutines import coroutine diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -594,6 +594,10 @@ """Return a future aggregating results from the given coroutines or futures. + Coroutines will be wrapped in a future and scheduled in the event + loop. They will not necessarily be scheduled in the same order as + passed in. + All futures must share the same event loop. If all the tasks are done successfully, the returned future's result is the list of results (in the order of the original sequence, not necessarily 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 @@ -142,26 +142,6 @@ (INET, STREAM, TCP, '', ('1.2.3.4', 1)), base_events._ipaddr_info('1.2.3.4', b'1', INET, STREAM, TCP)) - def test_getaddrinfo_servname(self): - INET = socket.AF_INET - STREAM = socket.SOCK_STREAM - TCP = socket.IPPROTO_TCP - - self.assertEqual( - (INET, STREAM, TCP, '', ('1.2.3.4', 80)), - base_events._ipaddr_info('1.2.3.4', 'http', INET, STREAM, TCP)) - - self.assertEqual( - (INET, STREAM, TCP, '', ('1.2.3.4', 80)), - base_events._ipaddr_info('1.2.3.4', b'http', INET, STREAM, TCP)) - - # Raises "service/proto not found". - with self.assertRaises(OSError): - base_events._ipaddr_info('1.2.3.4', 'nonsense', INET, STREAM, TCP) - - with self.assertRaises(OSError): - base_events._ipaddr_info('1.2.3.4', 'nonsense', INET, STREAM, TCP) - @patch_socket def test_ipaddr_info_no_inet_pton(self, m_socket): del m_socket.inet_pton @@ -1209,6 +1189,37 @@ def test_create_connection_no_inet_pton(self, m_socket): self._test_create_connection_ip_addr(m_socket, False) + @patch_socket + def test_create_connection_service_name(self, m_socket): + m_socket.getaddrinfo = socket.getaddrinfo + sock = m_socket.socket.return_value + + self.loop.add_reader = mock.Mock() + self.loop.add_reader._is_coroutine = False + self.loop.add_writer = mock.Mock() + self.loop.add_writer._is_coroutine = False + + for service, port in ('http', 80), (b'http', 80): + coro = self.loop.create_connection(asyncio.Protocol, + '127.0.0.1', service) + + t, p = self.loop.run_until_complete(coro) + try: + sock.connect.assert_called_with(('127.0.0.1', port)) + _, kwargs = m_socket.socket.call_args + self.assertEqual(kwargs['family'], m_socket.AF_INET) + self.assertEqual(kwargs['type'], m_socket.SOCK_STREAM) + finally: + t.close() + test_utils.run_briefly(self.loop) # allow transport to close + + for service in 'nonsense', b'nonsense': + coro = self.loop.create_connection(asyncio.Protocol, + '127.0.0.1', service) + + with self.assertRaises(OSError): + self.loop.run_until_complete(coro) + def test_create_connection_no_local_addr(self): @asyncio.coroutine def getaddrinfo(host, *args, **kw): 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,6 +2,8 @@ import errno import socket +import threading +import time import unittest from unittest import mock try: @@ -1784,5 +1786,89 @@ '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() diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -1723,6 +1723,37 @@ wd['cw'] = cw # Would fail without __weakref__ slot. cw.gen = None # Suppress warning from __del__. + def test_corowrapper_throw(self): + # Issue 429: CoroWrapper.throw must be compatible with gen.throw + def foo(): + value = None + while True: + try: + value = yield value + except Exception as e: + value = e + + exception = Exception("foo") + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + self.assertIs(exception, cw.throw(exception)) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + self.assertIs(exception, cw.throw(Exception, exception)) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + exception = cw.throw(Exception, "foo") + self.assertIsInstance(exception, Exception) + self.assertEqual(exception.args, ("foo", )) + + cw = asyncio.coroutines.CoroWrapper(foo()) + cw.send(None) + exception = cw.throw(Exception, "foo", None) + self.assertIsInstance(exception, Exception) + self.assertEqual(exception.args, ("foo", )) + @unittest.skipUnless(PY34, 'need python 3.4 or later') def test_log_destroyed_pending_task(self): -- Repository URL: https://hg.python.org/cpython

1 0