Mailman 3 June 2015 - Python-checkins

peps: pep 492: Sync with the current implementation and new features.
by yury.selivanov June 26, 2015

June 26, 2015

https://hg.python.org/peps/rev/54da9180a758 changeset: 5897:54da9180a758 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Thu Jun 25 21:41:14 2015 -0400 summary: pep 492: Sync with the current implementation and new features. files: pep-0492.txt | 49 ++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 17 deletions(-) diff --git a/pep-0492.txt b/pep-0492.txt --- a/pep-0492.txt +++ b/pep-0492.txt @@ -117,8 +117,6 @@ coroutines* compatible with *native coroutines* (set by `types.coroutine()`_ function). - All coroutines have ``CO_GENERATOR`` flag set. - * Regular generators, when called, return a *generator object*; similarly, coroutines return a *coroutine* object. @@ -135,7 +133,7 @@ types.coroutine() ----------------- -A new function ``coroutine(gen)`` is added to the ``types`` module. It +A new function ``coroutine(fn)`` is added to the ``types`` module. It allows interoperability between existing *generator-based coroutines* in asyncio and *native coroutines* introduced by this PEP:: @@ -147,8 +145,9 @@ The function applies ``CO_ITERABLE_COROUTINE`` flag to generator- function's code object, making it return a *coroutine* object. -The function can be used as a decorator, since it modifies generator- -functions in-place and returns them. +If ``fn`` is not a *generator function*, it is wrapped. If it returns +a *generator*, it will be wrapped in an *awaitable* proxy object +(see below the definition of awaitable objects). Note, that the ``CO_COROUTINE`` flag is not applied by ``types.coroutine()`` to make it possible to separate *native @@ -176,8 +175,8 @@ * A *native coroutine* object returned from a *native coroutine function*. -* A *generator-based coroutine* object returned from a *generator - function* decorated with ``types.coroutine()``. +* A *generator-based coroutine* object returned from a function + decorated with ``types.coroutine()``. * An object with an ``__await__`` method returning an iterator. @@ -204,7 +203,7 @@ It is a ``TypeError`` if ``__await__`` returns anything but an iterator. -* Objects defined with CPython C API with a ``tp_as_async->am_await`` +* Objects defined with CPython C API with a ``tp_as_async.am_await`` function, returning an *iterator* (similar to ``__await__`` method). It is a ``SyntaxError`` to use ``await`` outside of an ``async def`` @@ -413,11 +412,13 @@ asynchronous code in its *next* method. To support asynchronous iteration: -1. An object must implement an ``__aiter__`` method returning an +1. An object must implement an ``__aiter__`` method (or, if defined + with CPython C API, ``tp_as_async.am_aiter`` slot) returning an *awaitable* resulting in an *asynchronous iterator object*. 2. An *asynchronous iterator object* must implement an ``__anext__`` - method returning an *awaitable*. + method (or, if defined with CPython C API, ``tp_as_async.am_anext`` + slot) returning an *awaitable*. 3. To stop iteration ``__anext__`` must raise a ``StopAsyncIteration`` exception. @@ -681,16 +682,24 @@ details. * ``inspect.iscoroutine(obj)`` returns ``True`` if ``obj`` is a - *coroutine* object. + *native coroutine* object. * ``inspect.iscoroutinefunction(obj)`` returns ``True`` if ``obj`` is a - *coroutine function*. + *native coroutine function*. * ``inspect.isawaitable(obj)`` returns ``True`` if ``obj`` can be used in ``await`` expression. See `Await Expression`_ for details. +* ``inspect.getcoroutinestate(coro)`` returns the current state of + a *native coroutine object* (mirrors + ``inspect.getfgeneratorstate(gen)``). + +* ``inspect.getcoroutinelocals(coro)`` returns the mapping of a + *native coroutine object's* local variables to their values + (mirrors ``inspect.getgeneratorlocals(gen)``). + * ``sys.set_coroutine_wrapper(wrapper)`` allows to intercept creation of - *coroutine* objects. ``wrapper`` must be either a callable that + *native coroutine* objects. ``wrapper`` must be either a callable that accepts one argument (a *coroutine* object), or ``None``. ``None`` resets the wrapper. If called twice, the new wrapper replaces the previous one. The function is thread-specific. See `Debugging @@ -1321,15 +1330,15 @@ keyword. 2. New ``__await__`` method for Future-like objects, and new - ``tp_as_async->am_await`` slot in ``PyTypeObject``. + ``tp_as_async.am_await`` slot in ``PyTypeObject``. 3. New syntax for asynchronous context managers: ``async with``. And associated protocol with ``__aenter__`` and ``__aexit__`` methods. 4. New syntax for asynchronous iteration: ``async for``. And associated protocol with ``__aiter__``, ``__aexit__`` and new built- - in exception ``StopAsyncIteration``. New ``tp_as_async->am_aiter`` - and ``tp_as_async->am_anext`` slots in ``PyTypeObject``. + in exception ``StopAsyncIteration``. New ``tp_as_async.am_aiter`` + and ``tp_as_async.am_anext`` slots in ``PyTypeObject``. 5. New AST nodes: ``AsyncFunctionDef``, ``AsyncFor``, ``AsyncWith``, ``Await``. @@ -1337,7 +1346,8 @@ 6. New functions: ``sys.set_coroutine_wrapper(callback)``, ``sys.get_coroutine_wrapper()``, ``types.coroutine(gen)``, ``inspect.iscoroutinefunction(func)``, ``inspect.iscoroutine(obj)``, - and ``inspect.isawaitable(obj)``. + ``inspect.isawaitable(obj)``, ``inspect.getcoroutinestate(coro)``, + and ``inspect.getcoroutinelocals(coro)``. 7. New ``CO_COROUTINE`` and ``CO_ITERABLE_COROUTINE`` bit flags for code objects. @@ -1346,6 +1356,11 @@ ``collections.abc.Coroutine``, ``collections.abc.AsyncIterable``, and ``collections.abc.AsyncIterator``. +9. C API changes: new ``PyCoro_Type`` (exposed to Python as + ``types.CoroutineType``) and ``PyCoroObject``. + ``PyCoro_CheckExact(*o)`` to test if ``o`` is a *native coroutine*. + + While the list of changes and new things is not short, it is important to understand, that most users will not use these features directly. It is intended to be used in frameworks and libraries to provide users -- Repository URL: https://hg.python.org/peps

1 0

cpython (2.7): Issue #24496: Backport gzip examples to Python 2.
by berker.peksag June 25, 2015

June 25, 2015

https://hg.python.org/cpython/rev/10eea15880db changeset: 96682:10eea15880db branch: 2.7 user: Berker Peksag <berker.peksag(a)gmail.com> date: Thu Jun 25 23:57:42 2015 +0300 summary: Issue #24496: Backport gzip examples to Python 2. gzip.open() supports context management protocol in Python 2, so it's better to use it in the examples section. Patch by Jakub Kadlčík. files: Doc/library/gzip.rst | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst --- a/Doc/library/gzip.rst +++ b/Doc/library/gzip.rst @@ -96,26 +96,22 @@ Example of how to read a compressed file:: import gzip - f = gzip.open('file.txt.gz', 'rb') - file_content = f.read() - f.close() + with gzip.open('file.txt.gz', 'rb') as f: + file_content = f.read() Example of how to create a compressed GZIP file:: import gzip content = "Lots of content here" - f = gzip.open('file.txt.gz', 'wb') - f.write(content) - f.close() + with gzip.open('file.txt.gz', 'wb') as f: + f.write(content) Example of how to GZIP compress an existing file:: import gzip - f_in = open('file.txt', 'rb') - f_out = gzip.open('file.txt.gz', 'wb') - f_out.writelines(f_in) - f_out.close() - f_in.close() + import shutil + with open('file.txt', 'rb') as f_in, gzip.open('file.txt.gz', 'wb') as f_out: + shutil.copyfileobj(f_in, f_out) .. seealso:: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #23684: Clarify the return value of the scheme attribute of ParseResult
by berker.peksag June 25, 2015

June 25, 2015

1 0

cpython (merge 3.5 -> default): Issue #23684: Clarify the return value of the scheme attribute of ParseResult
by berker.peksag June 25, 2015

June 25, 2015

https://hg.python.org/cpython/rev/7846aadbd4f5 changeset: 96680:7846aadbd4f5 parent: 96677:9aad116baee8 parent: 96679:68629ebe0fee user: Berker Peksag <berker.peksag(a)gmail.com> date: Thu Jun 25 23:39:53 2015 +0300 summary: Issue #23684: Clarify the return value of the scheme attribute of ParseResult and SplitResult objects. Patch by Martin Panter. files: Doc/library/urllib.parse.rst | 16 +++++---- Lib/test/test_urlparse.py | 41 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -76,13 +76,15 @@ ParseResult(scheme='', netloc='', path='help/Python.html', params='', query='', fragment='') - If the *scheme* argument is specified, it gives the default addressing - scheme, to be used only if the URL does not specify one. The default value for - this argument is the empty string. + The *scheme* argument gives the default addressing scheme, to be + used only if the URL does not specify one. It should be the same type + (text or bytes) as *urlstring*, except that the default value ``''`` is + always allowed, and is automatically converted to ``b''`` if appropriate. If the *allow_fragments* argument is false, fragment identifiers are not - recognized and parsed as part of the preceding component. The default value - for this argument is :const:`True`. + recognized. Instead, they are parsed as part of the path, parameters + or query component, and :attr:`fragment` is set to the empty string in + the return value. The return value is actually an instance of a subclass of :class:`tuple`. This class has the following additional read-only convenience attributes: @@ -90,7 +92,7 @@ +------------------+-------+--------------------------+----------------------+ | Attribute | Index | Value | Value if not present | +==================+=======+==========================+======================+ - | :attr:`scheme` | 0 | URL scheme specifier | empty string | + | :attr:`scheme` | 0 | URL scheme specifier | *scheme* parameter | +------------------+-------+--------------------------+----------------------+ | :attr:`netloc` | 1 | Network location part | empty string | +------------------+-------+--------------------------+----------------------+ @@ -206,7 +208,7 @@ +------------------+-------+-------------------------+----------------------+ | Attribute | Index | Value | Value if not present | +==================+=======+=========================+======================+ - | :attr:`scheme` | 0 | URL scheme specifier | empty string | + | :attr:`scheme` | 0 | URL scheme specifier | *scheme* parameter | +------------------+-------+-------------------------+----------------------+ | :attr:`netloc` | 1 | Network location part | empty string | +------------------+-------+-------------------------+----------------------+ diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -686,6 +686,47 @@ self.assertEqual(urllib.parse.urlparse(b"x-newscheme://foo.com/stuff?query"), (b'x-newscheme', b'foo.com', b'/stuff', b'', b'query', b'')) + def test_default_scheme(self): + # Exercise the scheme parameter of urlparse() and urlsplit() + for func in (urllib.parse.urlparse, urllib.parse.urlsplit): + with self.subTest(function=func): + result = func("http://example.net/", "ftp") + self.assertEqual(result.scheme, "http") + result = func(b"http://example.net/", b"ftp") + self.assertEqual(result.scheme, b"http") + self.assertEqual(func("path", "ftp").scheme, "ftp") + self.assertEqual(func("path", scheme="ftp").scheme, "ftp") + self.assertEqual(func(b"path", scheme=b"ftp").scheme, b"ftp") + self.assertEqual(func("path").scheme, "") + self.assertEqual(func(b"path").scheme, b"") + self.assertEqual(func(b"path", "").scheme, b"") + + def test_parse_fragments(self): + # Exercise the allow_fragments parameter of urlparse() and urlsplit() + tests = ( + ("http:#frag", "path"), + ("//example.net#frag", "path"), + ("index.html#frag", "path"), + (";a=b#frag", "params"), + ("?a=b#frag", "query"), + ("#frag", "path"), + ) + for url, attr in tests: + for func in (urllib.parse.urlparse, urllib.parse.urlsplit): + if attr == "params" and func is urllib.parse.urlsplit: + attr = "path" + with self.subTest(url=url, function=func): + result = func(url, allow_fragments=False) + self.assertEqual(result.fragment, "") + self.assertTrue(getattr(result, attr).endswith("#frag")) + self.assertEqual(func(url, "", False).fragment, "") + + result = func(url, allow_fragments=True) + self.assertEqual(result.fragment, "frag") + self.assertFalse(getattr(result, attr).endswith("frag")) + self.assertEqual(func(url, "", True).fragment, "frag") + self.assertEqual(func(url).fragment, "frag") + def test_mixed_types_rejected(self): # Several functions that process either strings or ASCII encoded bytes # accept multiple arguments. Check they reject mixed type input -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #23684: Clarify the return value of the scheme attribute of ParseResult
by berker.peksag June 25, 2015

June 25, 2015

https://hg.python.org/cpython/rev/368db4b1ced9 changeset: 96678:368db4b1ced9 branch: 3.4 parent: 96675:3199ec504dbe user: Berker Peksag <berker.peksag(a)gmail.com> date: Thu Jun 25 23:38:48 2015 +0300 summary: Issue #23684: Clarify the return value of the scheme attribute of ParseResult and SplitResult objects. Patch by Martin Panter. files: Doc/library/urllib.parse.rst | 16 +++++---- Lib/test/test_urlparse.py | 41 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -76,13 +76,15 @@ ParseResult(scheme='', netloc='', path='help/Python.html', params='', query='', fragment='') - If the *scheme* argument is specified, it gives the default addressing - scheme, to be used only if the URL does not specify one. The default value for - this argument is the empty string. + The *scheme* argument gives the default addressing scheme, to be + used only if the URL does not specify one. It should be the same type + (text or bytes) as *urlstring*, except that the default value ``''`` is + always allowed, and is automatically converted to ``b''`` if appropriate. If the *allow_fragments* argument is false, fragment identifiers are not - recognized and parsed as part of the preceding component. The default value - for this argument is :const:`True`. + recognized. Instead, they are parsed as part of the path, parameters + or query component, and :attr:`fragment` is set to the empty string in + the return value. The return value is actually an instance of a subclass of :class:`tuple`. This class has the following additional read-only convenience attributes: @@ -90,7 +92,7 @@ +------------------+-------+--------------------------+----------------------+ | Attribute | Index | Value | Value if not present | +==================+=======+==========================+======================+ - | :attr:`scheme` | 0 | URL scheme specifier | empty string | + | :attr:`scheme` | 0 | URL scheme specifier | *scheme* parameter | +------------------+-------+--------------------------+----------------------+ | :attr:`netloc` | 1 | Network location part | empty string | +------------------+-------+--------------------------+----------------------+ @@ -206,7 +208,7 @@ +------------------+-------+-------------------------+----------------------+ | Attribute | Index | Value | Value if not present | +==================+=======+=========================+======================+ - | :attr:`scheme` | 0 | URL scheme specifier | empty string | + | :attr:`scheme` | 0 | URL scheme specifier | *scheme* parameter | +------------------+-------+-------------------------+----------------------+ | :attr:`netloc` | 1 | Network location part | empty string | +------------------+-------+-------------------------+----------------------+ diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -663,6 +663,47 @@ self.assertEqual(urllib.parse.urlparse(b"x-newscheme://foo.com/stuff?query"), (b'x-newscheme', b'foo.com', b'/stuff', b'', b'query', b'')) + def test_default_scheme(self): + # Exercise the scheme parameter of urlparse() and urlsplit() + for func in (urllib.parse.urlparse, urllib.parse.urlsplit): + with self.subTest(function=func): + result = func("http://example.net/", "ftp") + self.assertEqual(result.scheme, "http") + result = func(b"http://example.net/", b"ftp") + self.assertEqual(result.scheme, b"http") + self.assertEqual(func("path", "ftp").scheme, "ftp") + self.assertEqual(func("path", scheme="ftp").scheme, "ftp") + self.assertEqual(func(b"path", scheme=b"ftp").scheme, b"ftp") + self.assertEqual(func("path").scheme, "") + self.assertEqual(func(b"path").scheme, b"") + self.assertEqual(func(b"path", "").scheme, b"") + + def test_parse_fragments(self): + # Exercise the allow_fragments parameter of urlparse() and urlsplit() + tests = ( + ("http:#frag", "path"), + ("//example.net#frag", "path"), + ("index.html#frag", "path"), + (";a=b#frag", "params"), + ("?a=b#frag", "query"), + ("#frag", "path"), + ) + for url, attr in tests: + for func in (urllib.parse.urlparse, urllib.parse.urlsplit): + if attr == "params" and func is urllib.parse.urlsplit: + attr = "path" + with self.subTest(url=url, function=func): + result = func(url, allow_fragments=False) + self.assertEqual(result.fragment, "") + self.assertTrue(getattr(result, attr).endswith("#frag")) + self.assertEqual(func(url, "", False).fragment, "") + + result = func(url, allow_fragments=True) + self.assertEqual(result.fragment, "frag") + self.assertFalse(getattr(result, attr).endswith("frag")) + self.assertEqual(func(url, "", True).fragment, "frag") + self.assertEqual(func(url).fragment, "frag") + def test_mixed_types_rejected(self): # Several functions that process either strings or ASCII encoded bytes # accept multiple arguments. Check they reject mixed type input -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Issue #23684: Clarify the return value of the scheme attribute of ParseResult
by berker.peksag June 25, 2015

June 25, 2015

https://hg.python.org/cpython/rev/68629ebe0fee changeset: 96679:68629ebe0fee branch: 3.5 parent: 96676:fc69dd6aea55 parent: 96678:368db4b1ced9 user: Berker Peksag <berker.peksag(a)gmail.com> date: Thu Jun 25 23:39:26 2015 +0300 summary: Issue #23684: Clarify the return value of the scheme attribute of ParseResult and SplitResult objects. Patch by Martin Panter. files: Doc/library/urllib.parse.rst | 16 +++++---- Lib/test/test_urlparse.py | 41 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -76,13 +76,15 @@ ParseResult(scheme='', netloc='', path='help/Python.html', params='', query='', fragment='') - If the *scheme* argument is specified, it gives the default addressing - scheme, to be used only if the URL does not specify one. The default value for - this argument is the empty string. + The *scheme* argument gives the default addressing scheme, to be + used only if the URL does not specify one. It should be the same type + (text or bytes) as *urlstring*, except that the default value ``''`` is + always allowed, and is automatically converted to ``b''`` if appropriate. If the *allow_fragments* argument is false, fragment identifiers are not - recognized and parsed as part of the preceding component. The default value - for this argument is :const:`True`. + recognized. Instead, they are parsed as part of the path, parameters + or query component, and :attr:`fragment` is set to the empty string in + the return value. The return value is actually an instance of a subclass of :class:`tuple`. This class has the following additional read-only convenience attributes: @@ -90,7 +92,7 @@ +------------------+-------+--------------------------+----------------------+ | Attribute | Index | Value | Value if not present | +==================+=======+==========================+======================+ - | :attr:`scheme` | 0 | URL scheme specifier | empty string | + | :attr:`scheme` | 0 | URL scheme specifier | *scheme* parameter | +------------------+-------+--------------------------+----------------------+ | :attr:`netloc` | 1 | Network location part | empty string | +------------------+-------+--------------------------+----------------------+ @@ -206,7 +208,7 @@ +------------------+-------+-------------------------+----------------------+ | Attribute | Index | Value | Value if not present | +==================+=======+=========================+======================+ - | :attr:`scheme` | 0 | URL scheme specifier | empty string | + | :attr:`scheme` | 0 | URL scheme specifier | *scheme* parameter | +------------------+-------+-------------------------+----------------------+ | :attr:`netloc` | 1 | Network location part | empty string | +------------------+-------+-------------------------+----------------------+ diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -686,6 +686,47 @@ self.assertEqual(urllib.parse.urlparse(b"x-newscheme://foo.com/stuff?query"), (b'x-newscheme', b'foo.com', b'/stuff', b'', b'query', b'')) + def test_default_scheme(self): + # Exercise the scheme parameter of urlparse() and urlsplit() + for func in (urllib.parse.urlparse, urllib.parse.urlsplit): + with self.subTest(function=func): + result = func("http://example.net/", "ftp") + self.assertEqual(result.scheme, "http") + result = func(b"http://example.net/", b"ftp") + self.assertEqual(result.scheme, b"http") + self.assertEqual(func("path", "ftp").scheme, "ftp") + self.assertEqual(func("path", scheme="ftp").scheme, "ftp") + self.assertEqual(func(b"path", scheme=b"ftp").scheme, b"ftp") + self.assertEqual(func("path").scheme, "") + self.assertEqual(func(b"path").scheme, b"") + self.assertEqual(func(b"path", "").scheme, b"") + + def test_parse_fragments(self): + # Exercise the allow_fragments parameter of urlparse() and urlsplit() + tests = ( + ("http:#frag", "path"), + ("//example.net#frag", "path"), + ("index.html#frag", "path"), + (";a=b#frag", "params"), + ("?a=b#frag", "query"), + ("#frag", "path"), + ) + for url, attr in tests: + for func in (urllib.parse.urlparse, urllib.parse.urlsplit): + if attr == "params" and func is urllib.parse.urlsplit: + attr = "path" + with self.subTest(url=url, function=func): + result = func(url, allow_fragments=False) + self.assertEqual(result.fragment, "") + self.assertTrue(getattr(result, attr).endswith("#frag")) + self.assertEqual(func(url, "", False).fragment, "") + + result = func(url, allow_fragments=True) + self.assertEqual(result.fragment, "frag") + self.assertFalse(getattr(result, attr).endswith("frag")) + self.assertEqual(func(url, "", True).fragment, "frag") + self.assertEqual(func(url).fragment, "frag") + def test_mixed_types_rejected(self): # Several functions that process either strings or ASCII encoded bytes # accept multiple arguments. Check they reject mixed type input -- Repository URL: https://hg.python.org/cpython

1 0

devguide: Add myself to experts/types (to make sure I know about @coroutine issues)
by yury.selivanov June 25, 2015

June 25, 2015

https://hg.python.org/devguide/rev/cb9aa606fbfb changeset: 747:cb9aa606fbfb user: Yury Selivanov <yselivanov(a)sprymix.com> date: Thu Jun 25 15:31:24 2015 -0400 summary: Add myself to experts/types (to make sure I know about @coroutine issues) files: experts.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experts.rst b/experts.rst --- a/experts.rst +++ b/experts.rst @@ -241,7 +241,7 @@ tracemalloc haypo tty twouters* turtle gregorlingl -types +types yselivanov unicodedata loewis, lemburg, ezio.melotti unittest michael.foord*, ezio.melotti, rbcollins unittest.mock michael.foord* -- Repository URL: https://hg.python.org/devguide

1 0

cpython (merge 3.5 -> default): Merge 3.5 (issue #24509)
by yury.selivanov June 25, 2015

June 25, 2015

https://hg.python.org/cpython/rev/9aad116baee8 changeset: 96677:9aad116baee8 parent: 96674:a497e7faa09b parent: 96676:fc69dd6aea55 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Thu Jun 25 13:50:38 2015 -0400 summary: Merge 3.5 (issue #24509) files: Doc/library/asyncio-eventloop.rst | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -97,7 +97,8 @@ Any positional arguments after the callback will be passed to the callback when it is called. - An instance of :class:`asyncio.Handle` is returned. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. :ref:`Use functools.partial to pass keywords to the callback <asyncio-pass-keywords>`. @@ -130,7 +131,8 @@ Arrange for the *callback* to be called after the given *delay* seconds (either an int or float). - An instance of :class:`asyncio.Handle` is returned. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. *callback* will be called exactly once per call to :meth:`call_later`. If two callbacks are scheduled for exactly the same time, it is @@ -151,6 +153,9 @@ This method's behavior is the same as :meth:`call_later`. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. + :ref:`Use functools.partial to pass keywords to the callback <asyncio-pass-keywords>`. @@ -704,7 +709,8 @@ .. method:: cancel() - Cancel the call. + Cancel the call. If the callback is already canceled or executed, + this method has no effect. Event loop examples -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #24509: Clarify Handle.cancel() and loop.call_* methods.
by yury.selivanov June 25, 2015

June 25, 2015

https://hg.python.org/cpython/rev/3199ec504dbe changeset: 96675:3199ec504dbe branch: 3.4 parent: 96672:5f1ce5afd3ee user: Yury Selivanov <yselivanov(a)sprymix.com> date: Thu Jun 25 13:49:52 2015 -0400 summary: Issue #24509: Clarify Handle.cancel() and loop.call_* methods. files: Doc/library/asyncio-eventloop.rst | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -97,7 +97,8 @@ Any positional arguments after the callback will be passed to the callback when it is called. - An instance of :class:`asyncio.Handle` is returned. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. :ref:`Use functools.partial to pass keywords to the callback <asyncio-pass-keywords>`. @@ -130,7 +131,8 @@ Arrange for the *callback* to be called after the given *delay* seconds (either an int or float). - An instance of :class:`asyncio.Handle` is returned. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. *callback* will be called exactly once per call to :meth:`call_later`. If two callbacks are scheduled for exactly the same time, it is @@ -151,6 +153,9 @@ This method's behavior is the same as :meth:`call_later`. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. + :ref:`Use functools.partial to pass keywords to the callback <asyncio-pass-keywords>`. @@ -704,7 +709,8 @@ .. method:: cancel() - Cancel the call. + Cancel the call. If the callback is already canceled or executed, + this method has no effect. Event loop examples -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Merge 3.4 (issue #24509)
by yury.selivanov June 25, 2015

June 25, 2015

https://hg.python.org/cpython/rev/fc69dd6aea55 changeset: 96676:fc69dd6aea55 branch: 3.5 parent: 96673:ed9bd661f627 parent: 96675:3199ec504dbe user: Yury Selivanov <yselivanov(a)sprymix.com> date: Thu Jun 25 13:50:21 2015 -0400 summary: Merge 3.4 (issue #24509) files: Doc/library/asyncio-eventloop.rst | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -97,7 +97,8 @@ Any positional arguments after the callback will be passed to the callback when it is called. - An instance of :class:`asyncio.Handle` is returned. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. :ref:`Use functools.partial to pass keywords to the callback <asyncio-pass-keywords>`. @@ -130,7 +131,8 @@ Arrange for the *callback* to be called after the given *delay* seconds (either an int or float). - An instance of :class:`asyncio.Handle` is returned. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. *callback* will be called exactly once per call to :meth:`call_later`. If two callbacks are scheduled for exactly the same time, it is @@ -151,6 +153,9 @@ This method's behavior is the same as :meth:`call_later`. + An instance of :class:`asyncio.Handle` is returned, which can be + used to cancel the callback. + :ref:`Use functools.partial to pass keywords to the callback <asyncio-pass-keywords>`. @@ -704,7 +709,8 @@ .. method:: cancel() - Cancel the call. + Cancel the call. If the callback is already canceled or executed, + this method has no effect. Event loop examples -- Repository URL: https://hg.python.org/cpython

1 0