Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
a3160851
Commit
a3160851
authored
May 30, 2015
by
Yury Selivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue 24004: Support Awaitables (pep 492) in @asyncio.coroutine decorator
parent
03395687
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
Lib/asyncio/coroutines.py
Lib/asyncio/coroutines.py
+13
-2
No files found.
Lib/asyncio/coroutines.py
View file @
a3160851
...
@@ -54,9 +54,10 @@ else:
...
@@ -54,9 +54,10 @@ else:
inspect
.
CO_COROUTINE
)
inspect
.
CO_COROUTINE
)
try
:
try
:
from
collections.abc
import
Coroutine
as
CoroutineABC
from
collections.abc
import
Coroutine
as
CoroutineABC
,
\
Awaitable
as
AwaitableABC
except
ImportError
:
except
ImportError
:
CoroutineABC
=
None
CoroutineABC
=
AwaitableABC
=
None
# Check for CPython issue #21209
# Check for CPython issue #21209
...
@@ -192,6 +193,16 @@ def coroutine(func):
...
@@ -192,6 +193,16 @@ def coroutine(func):
res
=
func
(
*
args
,
**
kw
)
res
=
func
(
*
args
,
**
kw
)
if
isinstance
(
res
,
futures
.
Future
)
or
inspect
.
isgenerator
(
res
):
if
isinstance
(
res
,
futures
.
Future
)
or
inspect
.
isgenerator
(
res
):
res
=
yield
from
res
res
=
yield
from
res
elif
AwaitableABC
is
not
None
:
# If 'func' returns an Awaitable (new in 3.5) we
# want to run it.
try
:
await_meth
=
res
.
__await__
except
AttributeError
:
pass
else
:
if
isinstance
(
res
,
AwaitableABC
):
res
=
yield
from
await_meth
()
return
res
return
res
if
not
_DEBUG
:
if
not
_DEBUG
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment