diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-07 17:26:54 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-07 17:26:54 +0200 |
| commit | 1a870c913238e6e2178283b1d69e9be9203473f2 (patch) | |
| tree | a433b73f12bc92783ecf57c0ad77f4a17126c712 /Lib | |
| parent | 11116da935760bb5ff02a450708f56d3b36b7556 (diff) | |
| download | cpython-git-1a870c913238e6e2178283b1d69e9be9203473f2.tar.gz | |
asyncio: sync with Tulip
- Tulip issue #181: Faster create_connection(). Call directly
waiter.set_result() in the constructor of _ProactorBasePipeTransport and
_SelectorSocketTransport, instead of using of delaying the call with
call_soon().
- Cleanup iscoroutine()
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/asyncio/coroutines.py | 4 | ||||
| -rw-r--r-- | Lib/asyncio/proactor_events.py | 2 | ||||
| -rw-r--r-- | Lib/asyncio/selector_events.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py index 7654a0b9e0..48730c225a 100644 --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -166,11 +166,11 @@ def iscoroutinefunction(func): return getattr(func, '_is_coroutine', False) -_COROUTINE_TYPES = (CoroWrapper, types.GeneratorType) +_COROUTINE_TYPES = (types.GeneratorType, CoroWrapper) def iscoroutine(obj): """Return True if obj is a coroutine object.""" - return isinstance(obj, _COROUTINE_TYPES) + return isinstance(obj, _COROUTINE_TYPES) def _format_coroutine(coro): diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index a80876f366..23545c9ee9 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -38,7 +38,7 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin, self._server.attach(self) self._loop.call_soon(self._protocol.connection_made, self) if waiter is not None: - self._loop.call_soon(waiter._set_result_unless_cancelled, None) + waiter.set_result(None) def _set_extra(self, sock): self._extra['pipe'] = sock diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 2a170340b9..628efb750c 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -481,7 +481,7 @@ class _SelectorSocketTransport(_SelectorTransport): self._loop.add_reader(self._sock_fd, self._read_ready) self._loop.call_soon(self._protocol.connection_made, self) if waiter is not None: - self._loop.call_soon(waiter._set_result_unless_cancelled, None) + waiter.set_result(None) def pause_reading(self): if self._closing: |