Merge 3.6 (issue #28843)

2 files changed, 20 insertions, 0 deletions

diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index e048380e98..a18d49ae37 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -1952,6 +1952,21 @@ class BaseTaskTests:
         self.assertFalse(gather_task.cancelled())
         self.assertEqual(gather_task.result(), [42])
 
+    def test_exception_traceback(self):
+        # See http://bugs.python.org/issue28843
+
+        @asyncio.coroutine
+        def foo():
+            1 / 0
+
+        @asyncio.coroutine
+        def main():
+            task = self.new_task(self.loop, foo())
+            yield  # skip one loop iteration
+            self.assertIsNotNone(task.exception().__traceback__)
+
+        self.loop.run_until_complete(main())
+
     @mock.patch('asyncio.base_events.logger')
     def test_error_in_call_soon(self, m_log):
         def call_soon(callback, *args):
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 19503a86f2..86f191d8f5 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -1041,6 +1041,8 @@ FutureIter_throw(futureiterobject *self, PyObject *args)
 
     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 @@ task_step_impl(TaskObj *task, PyObject *exc)
         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() */