#undefine "PyUnicode_IS_READY" and friends in Py3.12 since CPython still defines them as dummies.

scoder · scoder · commit 06631bb06772 · 2022-05-17T19:01:48.000+02:00
diff --git a/src/lxml/includes/etree_defs.h b/src/lxml/includes/etree_defs.h
@@ -78,13 +78,6 @@
 #  define PyFile_AsFile(o)                   (NULL)
 #endif
 
-#if PY_VERSION_HEX <= 0x03030000 && !(defined(CYTHON_PEP393_ENABLED) && CYTHON_PEP393_ENABLED)
-  #define PyUnicode_IS_READY(op)    (0)
-  #define PyUnicode_GET_LENGTH(u)   PyUnicode_GET_SIZE(u)
-  #define PyUnicode_KIND(u)         (sizeof(Py_UNICODE))
-  #define PyUnicode_DATA(u)         ((void*)PyUnicode_AS_UNICODE(u))
-#endif
-
 #if IS_PYPY
 #  ifndef PyUnicode_FromFormat
 #    define PyUnicode_FromFormat  PyString_FromFormat
diff --git a/src/lxml/python.pxd b/src/lxml/python.pxd
@@ -8,11 +8,16 @@ cdef extern from *:
 cdef extern from "Python.h":
     """
     #if defined(CYTHON_PEP393_ENABLED) && CYTHON_PEP393_ENABLED
-    #if PY_VERSION_HEX >= 0x030C0000 && !defined(PyUnicode_IS_READY)
+    #if PY_VERSION_HEX >= 0x030C0000
+      #undef PyUnicode_IS_READY
       #define PyUnicode_IS_READY(s)  (1)
+      #undef PyUnicode_READY
       #define PyUnicode_READY(s)  (0)
+      #undef PyUnicode_AS_DATA
       #define PyUnicode_AS_DATA(s)  (0)
+      #undef PyUnicode_GET_DATA_SIZE
       #define PyUnicode_GET_DATA_SIZE(s)  (0)
+      #undef PyUnicode_GET_SIZE
       #define PyUnicode_GET_SIZE(s)  (0)
     #endif
     #elif PY_VERSION_HEX <= 0x03030000
