explosion/spaCy
1
1
Fork 0
mirror of https://github.com/explosion/spaCy.git synced 2025-02-05 06:00:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Py_UNICODE is not compatible with 3.12

Browse Source
This commit is contained in:
Daniël de Kok 2024-01-24 12:20:09 +01:00
parent c621e251b8
commit ce4ea5ffa7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spacy/pipeline/_parser_internals/search.pyx
View File

@ -1,4 +1,4 @@
# cython: profile=True, experimental_cpp_class_def=True, cdivision=True, infer_types=True # cython: experimental_cpp_class_def=True, cdivision=True, infer_types=True
cimport cython cimport cython
from cymem.cymem cimport Pool from cymem.cymem cimport Pool
from libc.math cimport exp from libc.math cimport exp

13
spacy/tests/parser/_search.pyx
View File

@ -12,7 +12,7 @@ from ..conftest import cytest
cdef struct TestState: cdef struct TestState:
int length int length
int x int x
Py_UNICODE* string char *string
cdef int transition(void* dest, void* src, class_t clas, void* extra_args) except -1: cdef int transition(void* dest, void* src, class_t clas, void* extra_args) except -1:
@ -22,7 +22,7 @@ cdef int transition(void* dest, void* src, class_t clas, void* extra_args) excep
dest_state.x = src_state.x dest_state.x = src_state.x
dest_state.x += clas dest_state.x += clas
if extra_args != NULL: if extra_args != NULL:
dest_state.string = <Py_UNICODE*>extra_args dest_state.string = <char *>extra_args
else: else:
dest_state.string = src_state.string dest_state.string = src_state.string
@ -32,9 +32,9 @@ cdef void* initialize(Pool mem, int n, void* extra_args) except NULL:
state.length = n state.length = n
state.x = 1 state.x = 1
if extra_args == NULL: if extra_args == NULL:
state.string = u'default' state.string = 'default'
else: else:
state.string = <Py_UNICODE*>extra_args state.string = <char *>extra_args
return state return state
@ -77,7 +77,7 @@ def test_initialize(nr_class, beam_width, length):
for i in range(b.width): for i in range(b.width):
s = <TestState*>b.at(i) s = <TestState*>b.at(i)
assert s.length == length, s.length assert s.length == length, s.length
assert s.string == 'default' assert s.string.decode('utf8') == 'default'
@cytest @cytest
@ -88,11 +88,12 @@ def test_initialize(nr_class, beam_width, length):
] ]
) )
def test_initialize_extra(nr_class, beam_width, length, extra): def test_initialize_extra(nr_class, beam_width, length, extra):
extra = extra.encode("utf-8") if extra is not None else None
b = Beam(nr_class, beam_width) b = Beam(nr_class, beam_width)
if extra is None: if extra is None:
b.initialize(initialize, destroy, length, NULL) b.initialize(initialize, destroy, length, NULL)
else: else:
b.initialize(initialize, destroy, length, <void*><Py_UNICODE*>extra) b.initialize(initialize, destroy, length, <void*><char*>extra)
for i in range(b.width): for i in range(b.width):
s = <TestState*>b.at(i) s = <TestState*>b.at(i)
assert s.length == length assert s.length == length