Allow catching both C++ and Python exceptions. #2615
Conversation
| @@ -189,20 +189,31 @@ def infer_sequence_item_type(env, seq_node, index_node=None, seq_type=None): | |||
|
|
|||
| def get_exception_handler(exception_value): | |||
| if exception_value is None: | |||
| return "__Pyx_CppExn2PyErr();" | |||
| return "__Pyx_CppExn2PyErr();", False | |||
| elif (exception_value.type == PyrexTypes.c_char_type | |||
There was a problem hiding this comment.
Can this collide with an exception handler function that returns a char?
There was a problem hiding this comment.
The declarator is completely parsed by this point, and the type is a function type.
Cython/Compiler/ExprNodes.py
Outdated
| @@ -189,20 +189,31 @@ def infer_sequence_item_type(env, seq_node, index_node=None, seq_type=None): | |||
|
|
|||
| def get_exception_handler(exception_value): | |||
| if exception_value is None: | |||
| return "__Pyx_CppExn2PyErr();" | |||
| return "__Pyx_CppExn2PyErr();", False | |||
There was a problem hiding this comment.
It would be nice to have some kind of indication in this function what the True/False return values mean. At least a comment or docstring, but some named constant could also make it clearer. Or a named tuple?
Cython/Compiler/ExprNodes.py
Outdated
| return '%s(); if (!PyErr_Occurred()) PyErr_SetString(PyExc_RuntimeError , "Error converting c++ exception.");' % exception_value.entry.cname, False | ||
|
|
||
| def maybe_check_py_error(code, check_py_exception, pos, nogil): | ||
| if check_py_exception: |
Cython/Compiler/Nodes.py
Outdated
| @@ -737,13 +737,16 @@ def analyse(self, return_type, env, nonempty=0, directive_locals=None, visibilit | |||
| self.exception_value = self.exception_value.analyse_const_expression(env) | |||
| if self.exception_check == '+': | |||
| exc_val_type = self.exception_value.type | |||
| print exc_val_type | |||
There was a problem hiding this comment.
This breaks Py3 compatibility. ;-)
| @@ -440,6 +440,13 @@ called, which allows one to do custom C++ to Python error "translations." If | |||
| raise_py_error does not actually raise an exception a RuntimeError will be | |||
| raised. | |||
|
|
|||
| There is also the special form:: | |||
|
|
|||
| cdef int raise_py_or_cpp() except +* | |||
There was a problem hiding this comment.
This suggests that except + is rather orthogonal to the Python exception return value. But except +-1 looks funny … and it's very ambiguous.
Does @cython.exceptval('+') actually work in pure mode? There could be a way out in that corner …
There was a problem hiding this comment.
It is orthogonal, and there's not really a good way to mix them. The exception value is a return value in the normal case, and a ~error handler in the + case. One might want a return value or an error handler or neither or both.
Right now, however, you can't safely use a function that may throw C++ or Python exceptions.
I do like the idea of using decorators, perhaps with keyword arguments rather than magic characters.
|
Looks good enough to me now. The travis failure is due to the code checker, one of the code generation lines is rather long. Should we include this in 0.29? |
|
Or do you want to try finding a better API with decorators first? |
|
I'm going to go ahead and merge this and we can get it in 0.29. |
No description provided.