diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-29 13:15:19 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-29 13:15:19 (GMT) |
| commit | 2934262fd36c35843c01b96657047625ce2e3cf6 (patch) | |
| tree | 6e23f70391742924251faa7bf82092532951411d /Lib/asyncio/tasks.py | |
| parent | 54a231d5397bda24257f253eb1aaabf1b741a0b5 (diff) | |
| download | cpython-2934262fd36c35843c01b96657047625ce2e3cf6.zip cpython-2934262fd36c35843c01b96657047625ce2e3cf6.tar.gz cpython-2934262fd36c35843c01b96657047625ce2e3cf6.tar.bz2 | |
asyncio: sync with Tulip
* Cleanup gather(): use cancelled() method instead of using private Future
attribute
* Fix _UnixReadPipeTransport and _UnixWritePipeTransport. Only start reading
when connection_made() has been called.
* Issue #23333: Fix BaseSelectorEventLoop._accept_connection(). Close the
transport on error. In debug mode, log errors using call_exception_handler()
Diffstat (limited to 'Lib/asyncio/tasks.py')
| -rw-r--r-- | Lib/asyncio/tasks.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 63412a9..4f19a25 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -592,7 +592,7 @@ def gather(*coros_or_futures, loop=None, return_exceptions=False): fut.exception() return - if fut._state == futures._CANCELLED: + if fut.cancelled(): res = futures.CancelledError() if not return_exceptions: outer.set_exception(res) |