Skip to content

Fix import of moved CoroWrapper class #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SamWhited wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix import of moved CoroWrapper class #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bottle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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):
Expand Down