diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-08-14 19:32:37 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-08-14 19:32:37 (GMT) |
| commit | bb78adeece6cb87c0e20eec36f65cad7c23f27af (patch) | |
| tree | ff52a350a2dba148b026288a7aec3a6189ccac8f /Lib/asyncio | |
| parent | 7c97a05618733b93f0a6e80ad5b672c2f966f448 (diff) | |
| parent | 233983380d1868126918fd86252d6328b0f0ad50 (diff) | |
| download | cpython-bb78adeece6cb87c0e20eec36f65cad7c23f27af.zip cpython-bb78adeece6cb87c0e20eec36f65cad7c23f27af.tar.gz cpython-bb78adeece6cb87c0e20eec36f65cad7c23f27af.tar.bz2 | |
Merge 3.4 (Issue #24867)
Diffstat (limited to 'Lib/asyncio')
| -rw-r--r-- | Lib/asyncio/tasks.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 9bfc1cf..a235e74 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -128,7 +128,11 @@ class Task(futures.Future): returned for a suspended coroutine. """ frames = [] - f = self._coro.gi_frame + try: + # 'async def' coroutines + f = self._coro.cr_frame + except AttributeError: + f = self._coro.gi_frame if f is not None: while f is not None: if limit is not None: |