Merge pull request #23594 from oscargus/ft2fontdeprecationremoval

QuLogic · web-flow · commit 1076a1604050 · 2022-08-10T18:18:57.000-04:00
Expire deprecation on passing bytes to FT2Font.set_text
diff --git a/doc/api/next_api_changes/removals/23594-OG.rst b/doc/api/next_api_changes/removals/23594-OG.rst
@@ -0,0 +1,4 @@
+Passing bytes to ``FT2Font.set_text``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+... is no longer supported. Pass str instead.
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -596,22 +596,8 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
             codepoints[i] = PyUnicode_ReadChar(textobj, i);
         }
 #endif
-    } else if (PyBytes_Check(textobj)) {
-        if (PyErr_WarnEx(
-            PyExc_FutureWarning,
-            "Passing bytes to FTFont.set_text is deprecated since Matplotlib "
-            "3.4 and support will be removed in Matplotlib 3.6; pass str instead",
-            1)) {
-            return NULL;
-        }
-        size = PyBytes_Size(textobj);
-        codepoints.resize(size);
-        char *bytestr = PyBytes_AsString(textobj);
-        for (size_t i = 0; i < size; ++i) {
-            codepoints[i] = bytestr[i];
-        }
     } else {
-        PyErr_SetString(PyExc_TypeError, "String must be str or bytes");
+        PyErr_SetString(PyExc_TypeError, "set_text requires str-input.");
         return NULL;
     }
 
