From 2186bdebe5e8f9353f9ead3bec7507ed90a58227 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Mon, 19 Oct 2015 13:56:54 -0500 Subject: [PATCH] Fix import of moved CoroWrapper class --- bottle.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bottle.py b/bottle.py index 2e0ca610e..07c022e56 100644 --- a/bottle.py +++ b/bottle.py @@ -18,6 +18,10 @@ import logging import signal from aiohttp.wsgi import WSGIServerHttpProtocol +try: + from asyncio.coroutines import CoroWrapper +except ImportError: + from asyncio.tasks import CoroWrapper import asyncio __author__ = 'Marcel Hellkamp' @@ -2604,7 +2608,7 @@ def wrapper(*a, **ka): def yields(value): return isinstance(value, asyncio.futures.Future) or inspect.isgenerator(value) or \ - isinstance(value, asyncio.tasks.CoroWrapper) + isinstance(value, CoroWrapper) @asyncio.coroutine def call_maybe_yield(func, *args, **kwargs):