Merge 3.4 (asyncio)

This commit is contained in:
Victor Stinner 2015-01-30 00:16:31 +01:00
commit 49b74d1a91
4 changed files with 4 additions and 4 deletions

View File

@ -208,7 +208,7 @@ class BaseSubprocessTransport(transports.SubprocessTransport):
waiter.set_result(returncode)
self._exit_waiters = None
def wait(self):
def _wait(self):
"""Wait until the process exit and return the process return code.
This method is a coroutine."""

View File

@ -115,7 +115,7 @@ class Process:
"""Wait until the process exit and return the process return code.
This method is a coroutine."""
return (yield from self._transport.wait())
return (yield from self._transport._wait())
def send_signal(self, signal):
self._transport.send_signal(signal)

View File

@ -188,7 +188,7 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
yield from waiter
except:
transp.close()
yield from transp.wait()
yield from transp._wait()
raise
return transp

View File

@ -375,7 +375,7 @@ class ProactorEventLoop(proactor_events.BaseProactorEventLoop):
yield from waiter
except:
transp.close()
yield from transp.wait()
yield from transp._wait()
raise
return transp