aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools/cython
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2024-04-17 08:48:22 +0000
committerAlexander Smirnov <alex@ydb.tech>2024-04-17 08:48:22 +0000
commitcc2014c08c42990bd11697b26a7dec945898abd2 (patch)
tree9e52c3981fbd050d94b971bf3d99f466448568b6 /contrib/tools/cython
parentb41b33fc9f1e4b78a17c9dbc31607183104edd29 (diff)
parent1a3642c3548d1cffa7e447091c6b026383ba4a52 (diff)
downloadydb-cc2014c08c42990bd11697b26a7dec945898abd2.tar.gz
Merge branch 'rightlib' into mergelibs-240417-0847
Diffstat (limited to 'contrib/tools/cython')
-rw-r--r--contrib/tools/cython/Cython/Includes/cpython/unicode.pxd5
-rwxr-xr-xcontrib/tools/cython/cython.py2
-rw-r--r--contrib/tools/cython/patches/backport-for-oracledb.patch11
3 files changed, 17 insertions, 1 deletions
diff --git a/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd b/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd
index 2072c8cb2a..81260f2adc 100644
--- a/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd
+++ b/contrib/tools/cython/Cython/Includes/cpython/unicode.pxd
@@ -570,3 +570,8 @@ cdef extern from *:
int Py_UCS4_strncmp(const Py_UCS4 *s1, const Py_UCS4 *s2, size_t n)
Py_UCS4* Py_UCS4_strchr(const Py_UCS4 *s, Py_UCS4 c)
Py_UCS4* Py_UCS4_strrchr(const Py_UCS4 *s, Py_UCS4 c)
+
+# Backport from Cython 3
+ Py_UCS4 PyUnicode_READ(int kind, void *data, Py_ssize_t index)
+ unsigned int PyUnicode_KIND(object o)
+ void *PyUnicode_DATA(object o)
diff --git a/contrib/tools/cython/cython.py b/contrib/tools/cython/cython.py
index 4111f048da..554ba1b4ff 100755
--- a/contrib/tools/cython/cython.py
+++ b/contrib/tools/cython/cython.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Change content of this file to change uids for cython programs - cython 0.29.37 r1
+# Change content of this file to change uids for cython programs - cython 0.29.37 r0
#
# Cython -- Main Program, generic
diff --git a/contrib/tools/cython/patches/backport-for-oracledb.patch b/contrib/tools/cython/patches/backport-for-oracledb.patch
new file mode 100644
index 0000000000..10c3a54843
--- /dev/null
+++ b/contrib/tools/cython/patches/backport-for-oracledb.patch
@@ -0,0 +1,11 @@
+--- contrib/tools/cython/Cython/Includes/cpython/unicode.pxd (index)
++++ contrib/tools/cython/Cython/Includes/cpython/unicode.pxd (working tree)
+@@ -570,3 +570,8 @@ cdef extern from *:
+ int Py_UCS4_strncmp(const Py_UCS4 *s1, const Py_UCS4 *s2, size_t n)
+ Py_UCS4* Py_UCS4_strchr(const Py_UCS4 *s, Py_UCS4 c)
+ Py_UCS4* Py_UCS4_strrchr(const Py_UCS4 *s, Py_UCS4 c)
++
++# Backport from Cython 3
++ Py_UCS4 PyUnicode_READ(int kind, void *data, Py_ssize_t index)
++ unsigned int PyUnicode_KIND(object o)
++ void *PyUnicode_DATA(object o)