Merge pull request #176 from mkoeppe/nogil

Fix Cython 3 complaints about placement of nogil
sagemath · Sep 21, 2023 · 9c5b3ed · 9c5b3ed
2 parents d441cbf + 0c3c987
commit 9c5b3ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cysignals/signals.pxd.in b/src/cysignals/signals.pxd.in
@@ -54,7 +54,7 @@ cdef extern from "macros.h" nogil:
 # can be used to make Cython check whether there is a pending exception
 # (PyErr_Occurred() is non-NULL). To Cython, it will look like
 # cython_check_exception() actually raised the exception.
-cdef inline void cython_check_exception() nogil except *:
+cdef inline void cython_check_exception() except * nogil:
     pass
 
 

diff --git a/src/cysignals/tests.pyx b/src/cysignals/tests.pyx
@@ -275,7 +275,7 @@ def test_sig_on_cython(long delay=DEFAULT_DELAY):
     signal_after_delay(SIGINT, delay)
     c_test_sig_on_cython()
 
-cdef int c_test_sig_on_cython_except() nogil except 42:
+cdef int c_test_sig_on_cython_except() except 42 nogil:
     sig_on()
     infinite_loop()
 
@@ -293,7 +293,7 @@ def test_sig_on_cython_except(long delay=DEFAULT_DELAY):
         signal_after_delay(SIGINT, delay)
         c_test_sig_on_cython_except()
 
-cdef void c_test_sig_on_cython_except_all() nogil except *:
+cdef void c_test_sig_on_cython_except_all() except * nogil:
     sig_on()
     infinite_loop()
 
@@ -1297,7 +1297,7 @@ def test_thread_sig_block(long delay=DEFAULT_DELAY):
         sig_off()
 
 
-cdef void* func_thread_sig_block(void* ignored) nogil:
+cdef void* func_thread_sig_block(void* ignored) noexcept nogil:
     # This is executed by the two threads spawned by test_thread_sig_block()
     cdef int n
     for n in range(1000000):