Merge 3.6 (issue #28843)
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 19503a8..86f191d 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -1041,6 +1041,8 @@
if (PyExceptionClass_Check(type)) {
PyErr_NormalizeException(&type, &val, &tb);
+ /* No need to call PyException_SetTraceback since we'll be calling
+ PyErr_Restore for `type`, `val`, and `tb`. */
} else if (PyExceptionInstance_Check(type)) {
if (val) {
PyErr_SetString(PyExc_TypeError,
@@ -2001,6 +2003,9 @@
if (!ev || !PyObject_TypeCheck(ev, (PyTypeObject *) et)) {
PyErr_NormalizeException(&et, &ev, &tb);
}
+ if (tb != NULL) {
+ PyException_SetTraceback(ev, tb);
+ }
o = future_set_exception((FutureObj*)task, ev);
if (!o) {
/* An exception in Task.set_exception() */