Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make reraise_kj_exception available to downstream #344

Merged
merged 1 commit into from
Nov 5, 2023
Merged

Make reraise_kj_exception available to downstream #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion capnp/helpers/capabilityHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ::kj::Promise<kj::Own<PyRefCounter>> convert_to_pypromise(capnp::RemotePromise<c
return stealPyRef(wrap_dynamic_struct_reader(response)); } );
}

void reraise_kj_exception() {
void c_reraise_kj_exception() {
GILAcquire gil;
try {
if (PyErr_Occurred())
Expand Down
2 changes: 1 addition & 1 deletion capnp/helpers/capabilityHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ inline ::kj::Promise<kj::Own<PyRefCounter>> convert_to_pypromise(kj::Promise<voi
});
}

void reraise_kj_exception();
void c_reraise_kj_exception();

void check_py_error();

Expand Down
2 changes: 1 addition & 1 deletion capnp/helpers/helpers.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ from capnp.includes.capnp_cpp cimport (

from capnp.includes.schema_cpp cimport ByteArray

from non_circular cimport reraise_kj_exception
from non_circular cimport c_reraise_kj_exception as reraise_kj_exception

from cpython.ref cimport PyObject

Expand Down
2 changes: 1 addition & 1 deletion capnp/helpers/non_circular.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ from cpython.ref cimport PyObject
from libcpp cimport bool

cdef extern from "capnp/helpers/capabilityHelper.h":
void reraise_kj_exception()
void c_reraise_kj_exception()
cdef cppclass PyRefCounter:
PyRefCounter(PyObject *)
PyObject * obj
2 changes: 1 addition & 1 deletion capnp/includes/capnp_cpp.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cdef extern from "capnp/helpers/checkCompiler.h":

from libcpp cimport bool
from capnp.helpers.non_circular cimport (
reraise_kj_exception, PyRefCounter,
c_reraise_kj_exception as reraise_kj_exception, PyRefCounter,
)
from capnp.includes.schema_cpp cimport (
Node, Data, StructNode, EnumNode, InterfaceNode, MessageBuilder, MessageReader, ReaderOptions,
Expand Down
2 changes: 1 addition & 1 deletion capnp/includes/schema_cpp.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# distutils: language = c++

from libc.stdint cimport *
from capnp.helpers.non_circular cimport reraise_kj_exception
from capnp.helpers.non_circular cimport c_reraise_kj_exception as reraise_kj_exception

from capnp.includes.types cimport *

Expand Down
2 changes: 1 addition & 1 deletion capnp/lib/capnp.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ from capnp.includes.capnp_cpp cimport (
)
from capnp.includes.schema_cpp cimport Node as C_Node, EnumNode as C_EnumNode
from capnp.includes.types cimport *
from capnp.helpers.non_circular cimport reraise_kj_exception
from capnp.helpers cimport helpers

cdef void reraise_kj_exception()

cdef class _StructSchemaField:
cdef C_StructSchema.Field thisptr
Expand Down
4 changes: 4 additions & 0 deletions capnp/lib/capnp.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,10 @@ cdef api object wrap_kj_exception_for_reraise(capnp.Exception & exception) with
return ret


cdef void reraise_kj_exception():
helpers.reraise_kj_exception()


cdef api object get_exception_info(object exc_type, object exc_obj, object exc_tb) with gil:
try:
return (exc_tb.tb_frame.f_code.co_filename.encode(),
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ def run(self): # noqa: C901
"*.capnp",
"helpers/*.pxd",
"helpers/*.h",
"helpers/*.cpp",
"includes/*.pxd",
"lib/*.pxd",
"lib/*.py",
Expand Down
Loading