diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-12-26 20:29:45 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-12-26 20:29:45 (GMT) |
| commit | 0f9f7497d0b060b55ba72235cdab192adaeb2fba (patch) | |
| tree | 616aadf949b9cc6950591e0913ca4a4c1c4903aa /Lib/asyncio/proactor_events.py | |
| parent | 42cc0b711ec6f100edaa37dce8e6be5172418abb (diff) | |
| parent | 956de691f8bfc379a1f1453e9a53661c92afa15e (diff) | |
| download | cpython-0f9f7497d0b060b55ba72235cdab192adaeb2fba.zip cpython-0f9f7497d0b060b55ba72235cdab192adaeb2fba.tar.gz cpython-0f9f7497d0b060b55ba72235cdab192adaeb2fba.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/proactor_events.py')
| -rw-r--r-- | Lib/asyncio/proactor_events.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index e67cf65..44a8197 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -383,7 +383,7 @@ class BaseProactorEventLoop(base_events.BaseEventLoop): sock, protocol, waiter, extra) def close(self): - if self._running: + if self.is_running(): raise RuntimeError("Cannot close a running event loop") if self.is_closed(): return @@ -432,9 +432,7 @@ class BaseProactorEventLoop(base_events.BaseEventLoop): self._ssock.setblocking(False) self._csock.setblocking(False) self._internal_fds += 1 - # don't check the current loop because _make_self_pipe() is called - # from the event loop constructor - self._call_soon(self._loop_self_reading, (), check_loop=False) + self.call_soon(self._loop_self_reading) def _loop_self_reading(self, f=None): try: |