Merge 3.5 (issue #28639)

This commit is contained in:
Yury Selivanov 2016-11-08 19:59:29 -05:00
commit d8aa0c6eec
2 changed files with 5 additions and 2 deletions

View File

@ -219,10 +219,10 @@ def iscoroutine(object):
return isinstance(object, types.CoroutineType)
def isawaitable(object):
"""Return true is object can be passed to an ``await`` expression."""
"""Return true if object can be passed to an ``await`` expression."""
return (isinstance(object, types.CoroutineType) or
isinstance(object, types.GeneratorType) and
object.gi_code.co_flags & CO_ITERABLE_COROUTINE or
bool(object.gi_code.co_flags & CO_ITERABLE_COROUTINE) or
isinstance(object, collections.abc.Awaitable))
def istraceback(object):

View File

@ -40,6 +40,9 @@ Library
- Issue #26081: Fix refleak in _asyncio.Future.__iter__().throw.
- Issue #28639: Fix inspect.isawaitable to always return bool
Patch by Justin Mayfield.
Documentation
-------------