mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge 3.6

Browse source
This commit is contained in:
Benjamin Peterson 2016-11-14 00:15:52 -08:00
commit 2294f83c7c
2 changed files with 44 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/test/test_asyncio/test_futures.py
View file

@ -466,6 +466,15 @@ class BaseFutureTests:
self.fail('StopIteration was expected')
self.assertEqual(result, (1, 2))
def test_future_iter_throw(self):
fut = self._new_future(loop=self.loop)
fi = iter(fut)
self.assertRaises(TypeError, fi.throw,
Exception, Exception("elephant"), 32)
self.assertRaises(TypeError, fi.throw,
Exception("elephant"), Exception("elephant"))
self.assertRaises(TypeError, fi.throw, list)
@unittest.skipUnless(hasattr(futures, '_CFuture'),
'requires the C _asyncio module')

55
Modules/_asynciomodule.c
View file

@ -1031,31 +1031,46 @@ FutureIter_throw(futureiterobject *self, PyObject *args)
}
if (tb == Py_None) {
tb = NULL;
} else if (tb != NULL && !PyTraceBack_Check(tb)) {
PyErr_SetString(PyExc_TypeError, "throw() third argument must be a traceback");
return NULL;
}
Py_INCREF(type);
Py_XINCREF(val);
Py_XINCREF(tb);
if (PyExceptionClass_Check(type)) {
PyErr_NormalizeException(&type, &val, &tb);
} else if (PyExceptionInstance_Check(type)) {
if (val) {
PyErr_SetString(PyExc_TypeError,
"instance exception may not have a separate value");
goto fail;
}
val = type;
type = PyExceptionInstance_Class(type);
Py_INCREF(type);
if (tb == NULL)
tb = PyException_GetTraceback(val);
} else {
PyErr_SetString(PyExc_TypeError,
"exceptions must be classes deriving BaseException or "
"instances of such a class");
goto fail;
}
Py_CLEAR(self->future);
if (tb != NULL) {
PyErr_Restore(type, val, tb);
}
else if (val != NULL) {
PyErr_SetObject(type, val);
}
else {
if (PyExceptionClass_Check(type)) {
val = PyObject_CallObject(type, NULL);
PyErr_SetObject(type, val);
Py_DECREF(val);
}
else {
val = type;
assert (PyExceptionInstance_Check(val));
type = (PyObject*)Py_TYPE(val);
assert (PyExceptionClass_Check(type));
PyErr_SetObject(type, val);
}
}
PyErr_Restore(type, val, tb);
return FutureIter_iternext(self);
fail:
Py_DECREF(type);
Py_XDECREF(val);
Py_XDECREF(tb);
return NULL;
}
static PyObject *