Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Support throw() of string exceptions.

This commit is contained in:
Phillip J. Eby 2006-03-25 00:05:50 +00:00
parent 43b00da219
commit bee0712214
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_generators.py
View File

@ -1545,6 +1545,9 @@ caught ValueError (1)
>>> g.throw(ValueError, TypeError(1)) # mismatched type, rewrapped >>> g.throw(ValueError, TypeError(1)) # mismatched type, rewrapped
caught ValueError (1) caught ValueError (1)
>>> g.throw(ValueError, ValueError(1), None) # explicit None traceback
caught ValueError (1)
>>> g.throw(ValueError(1), "foo") # bad args >>> g.throw(ValueError(1), "foo") # bad args
Traceback (most recent call last): Traceback (most recent call last):
... ...
@ -1592,8 +1595,7 @@ ValueError: 7
>>> f().throw("abc") # throw on just-opened generator >>> f().throw("abc") # throw on just-opened generator
Traceback (most recent call last): Traceback (most recent call last):
... ...
TypeError: exceptions must be classes, or instances, not str abc
Now let's try closing a generator: Now let's try closing a generator:

5
Objects/genobject.c
View File

@ -249,7 +249,10 @@ gen_throw(PyGenObject *gen, PyObject *args)
Py_INCREF(typ); Py_INCREF(typ);
} }
} }
else {
/* Allow raising builtin string exceptions */
else if (!PyString_CheckExact(typ)) {
/* Not something you can raise. throw() fails. */ /* Not something you can raise. throw() fails. */
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"exceptions must be classes, or instances, not %s", "exceptions must be classes, or instances, not %s",