Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

asyncio: Get rid of _try_connected().

This commit is contained in:
Victor Stinner 2014-01-29 14:22:56 -08:00
parent 47fb97e4e6
commit aaabc4fdca
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Lib/asyncio/base_subprocess.py
View File

@ -75,19 +75,27 @@ class BaseSubprocessTransport(transports.SubprocessTransport):
proc = self._proc proc = self._proc
loop = self._loop loop = self._loop
if proc.stdin is not None: if proc.stdin is not None:
transp, proto = yield from loop.connect_write_pipe( _, pipe = yield from loop.connect_write_pipe(
lambda: WriteSubprocessPipeProto(self, STDIN), lambda: WriteSubprocessPipeProto(self, STDIN),
proc.stdin) proc.stdin)
self._pipes[STDIN] = pipe
if proc.stdout is not None: if proc.stdout is not None:
transp, proto = yield from loop.connect_read_pipe( _, pipe = yield from loop.connect_read_pipe(
lambda: ReadSubprocessPipeProto(self, STDOUT), lambda: ReadSubprocessPipeProto(self, STDOUT),
proc.stdout) proc.stdout)
self._pipes[STDOUT] = pipe
if proc.stderr is not None: if proc.stderr is not None:
transp, proto = yield from loop.connect_read_pipe( _, pipe = yield from loop.connect_read_pipe(
lambda: ReadSubprocessPipeProto(self, STDERR), lambda: ReadSubprocessPipeProto(self, STDERR),
proc.stderr) proc.stderr)
if not self._pipes: self._pipes[STDERR] = pipe
self._try_connected()
assert self._pending_calls is not None
self._loop.call_soon(self._protocol.connection_made, self)
for callback, data in self._pending_calls:
self._loop.call_soon(callback, *data)
self._pending_calls = None
def _call(self, cb, *data): def _call(self, cb, *data):
if self._pending_calls is not None: if self._pending_calls is not None:
@ -95,14 +103,6 @@ class BaseSubprocessTransport(transports.SubprocessTransport):
else: else:
self._loop.call_soon(cb, *data) self._loop.call_soon(cb, *data)
def _try_connected(self):
assert self._pending_calls is not None
if all(p is not None and p.connected for p in self._pipes.values()):
self._loop.call_soon(self._protocol.connection_made, self)
for callback, data in self._pending_calls:
self._loop.call_soon(callback, *data)
self._pending_calls = None
def _pipe_connection_lost(self, fd, exc): def _pipe_connection_lost(self, fd, exc):
self._call(self._protocol.pipe_connection_lost, fd, exc) self._call(self._protocol.pipe_connection_lost, fd, exc)
self._try_finish() self._try_finish()
@ -136,19 +136,15 @@ class BaseSubprocessTransport(transports.SubprocessTransport):
class WriteSubprocessPipeProto(protocols.BaseProtocol): class WriteSubprocessPipeProto(protocols.BaseProtocol):
pipe = None
def __init__(self, proc, fd): def __init__(self, proc, fd):
self.proc = proc self.proc = proc
self.fd = fd self.fd = fd
self.connected = False self.pipe = None
self.disconnected = False self.disconnected = False
proc._pipes[fd] = self
def connection_made(self, transport): def connection_made(self, transport):
self.connected = True
self.pipe = transport self.pipe = transport
self.proc._try_connected()
def connection_lost(self, exc): def connection_lost(self, exc):
self.disconnected = True self.disconnected = True