diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-12-18 23:47:55 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-12-18 23:47:55 +0100 |
| commit | 123759502eed7bd3e06aab781ec23d7829b918ca (patch) | |
| tree | 76f4f509a411abbe80b25b38e5a9ee5bd4e112af | |
| parent | f00346ce3727d566ec92fb0fa67cc9b4108d74e4 (diff) | |
| parent | 1b9763d0a9c62c13dc2a06770032e5906b610c96 (diff) | |
| download | cpython-git-123759502eed7bd3e06aab781ec23d7829b918ca.tar.gz | |
Merge 3.4 (asyncio)
| -rw-r--r-- | Lib/asyncio/base_subprocess.py | 2 | ||||
| -rw-r--r-- | Lib/asyncio/windows_events.py | 2 | ||||
| -rw-r--r-- | Lib/asyncio/windows_utils.py | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py index d008779360..81698b0985 100644 --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -153,7 +153,7 @@ class BaseSubprocessTransport(transports.SubprocessTransport): if all(p is not None and p.disconnected for p in self._pipes.values()): self._finished = True - self._loop.call_soon(self._call_connection_lost, None) + self._call(self._call_connection_lost, None) def _call_connection_lost(self, exc): try: diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 6763f0b7bd..0773d061f7 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -402,7 +402,7 @@ class IocpProactor: ov.getresult() return pipe - # FIXME: Tulip issue 196: why to we neeed register=False? + # FIXME: Tulip issue 196: why do we need register=False? # See also the comment in the _register() method return self._register(ov, pipe, finish_accept_pipe, register=False) diff --git a/Lib/asyncio/windows_utils.py b/Lib/asyncio/windows_utils.py index 1155a77f34..c6e4bc9e46 100644 --- a/Lib/asyncio/windows_utils.py +++ b/Lib/asyncio/windows_utils.py @@ -134,6 +134,13 @@ class PipeHandle: def __init__(self, handle): self._handle = handle + def __repr__(self): + if self._handle != -1: + handle = 'handle=%r' % self._handle + else: + handle = 'closed' + return '<%s %s>' % (self.__class__.__name__, handle) + @property def handle(self): return self._handle |