Merge pull request #17692 from meeseeksmachine/auto-backport-of-pr-17680-on-v3.3.x

QuLogic · web-flow · commit 393a1014bdf1 · 2020-06-19T21:45:29.000-04:00
Backport PR #17680 on branch v3.3.x (MNT: migrate away from deprecated c-api)
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -635,11 +635,10 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
     size_t size;
 
     if (PyUnicode_Check(textobj)) {
-        size = PyUnicode_GET_SIZE(textobj);
+        size = PyUnicode_GET_LENGTH(textobj);
         codepoints.resize(size);
-        Py_UNICODE *unistr = PyUnicode_AsUnicode(textobj);
         for (size_t i = 0; i < size; ++i) {
-            codepoints[i] = unistr[i];
+            codepoints[i] = PyUnicode_ReadChar(textobj, i);
         }
     } else if (PyBytes_Check(textobj)) {
         size = PyBytes_Size(textobj);
