Skip to content

Commit b4c9265

Browse files
author
Jean-Francois Maeyhieux - Zentoo
committed
Patch cython3-compat for grpcio
1 parent aac76c2 commit b4c9265

File tree

1 file changed

+60
-0
lines changed

1 file changed

+60
-0
lines changed
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
2+
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi 2023-09-06 03:32:05.000000000 +0200
3+
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi 2023-10-28 06:56:59.975270836 +0200
4+
@@ -48,7 +48,7 @@
5+
@staticmethod
6+
cdef void functor_run(
7+
grpc_completion_queue_functor* functor,
8+
- int succeed)
9+
+ int succeed ) noexcept
10+
11+
cdef grpc_completion_queue_functor *c_functor(self)
12+
13+
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
14+
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi 2023-09-06 03:32:05.000000000 +0200
15+
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi 2023-10-28 06:56:20.002663936 +0200
16+
@@ -50,7 +50,7 @@
17+
@staticmethod
18+
cdef void functor_run(
19+
grpc_completion_queue_functor* functor,
20+
- int success):
21+
+ int success) noexcept:
22+
cdef CallbackContext *context = <CallbackContext *>functor
23+
cdef object waiter = <object>context.waiter
24+
if not waiter.cancelled():
25+
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
26+
--- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi 2023-09-06 03:32:05.000000000 +0200
27+
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi 2023-10-28 06:54:57.193406642 +0200
28+
@@ -314,7 +314,7 @@
29+
return credentials
30+
31+
cdef grpc_ssl_certificate_config_reload_status _server_cert_config_fetcher_wrapper(
32+
- void* user_data, grpc_ssl_server_certificate_config **config) with gil:
33+
+ void* user_data, grpc_ssl_server_certificate_config **config) noexcept with gil:
34+
# This is a credentials.ServerCertificateConfig
35+
cdef ServerCertificateConfig cert_config = None
36+
if not user_data:
37+
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
38+
--- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi 2023-09-06 03:32:05.000000000 +0200
39+
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi 2023-10-28 06:53:41.609259047 +0200
40+
@@ -13,16 +13,16 @@
41+
# limitations under the License.
42+
43+
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
44+
-cdef void* _copy_pointer(void* pointer):
45+
+cdef void* _copy_pointer(void* pointer) noexcept:
46+
return pointer
47+
48+
49+
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
50+
-cdef void _destroy_pointer(void* pointer):
51+
+cdef void _destroy_pointer(void* pointer) noexcept:
52+
pass
53+
54+
55+
-cdef int _compare_pointer(void* first_pointer, void* second_pointer):
56+
+cdef int _compare_pointer(void* first_pointer, void* second_pointer) noexcept:
57+
if first_pointer < second_pointer:
58+
return -1
59+
elif first_pointer > second_pointer:
60+

0 commit comments

Comments
 (0)