Skip to content

[3.6] bpo-33584: Fix several minor bugs in asyncio. (GH-7003) #7006

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

Merged
serhiy-storchaka merged 1 commit into from
May 20, 2018
Merged

[3.6] bpo-33584: Fix several minor bugs in asyncio. (GH-7003) #7006

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Lib/asyncio/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def _step(self, exc=None):
self._step,
RuntimeError(
'yield was used instead of yield from for '
'generator in task {!r} with {}'.format(
'generator in task {!r} with {!r}'.format(
self, result)))
else:
# Yielding something else is an error.
Expand Down
12 changes: 6 additions & 6 deletions Modules/_asynciomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,19 +2248,19 @@ task_step_impl(TaskObj *task, PyObject *exc)
}
if (res == 1) {
/* `result` is a generator */
PyObject *ret;
ret = task_set_error_soon(
o = task_set_error_soon(
task, PyExc_RuntimeError,
"yield was used instead of yield from for "
"generator in task %R with %S", task, result);
"generator in task %R with %R", task, result);
Py_DECREF(result);
return ret;
return o;
}

/* The `result` is none of the above */
Py_DECREF(result);
return task_set_error_soon(
o = task_set_error_soon(
task, PyExc_RuntimeError, "Task got bad yield: %R", result);
Py_DECREF(result);
return o;

self_await:
o = task_set_error_soon(
Expand Down