Merge pull request #16282 from anntzer/unun

timhoffm · web-flow · commit 75d3c9b77369 · 2020-01-22T22:45:26.000+01:00
Replace "unicode" by "str" in docs, messages when referring to the type.
diff --git a/lib/matplotlib/category.py b/lib/matplotlib/category.py
@@ -196,16 +196,14 @@ def update(self, data):
 
         Parameters
         ----------
-        data : iterable
-            sequence of string values
+        data : iterable of str or bytes
 
         Raises
         ------
         TypeError
-              If the value in data is not a string, unicode, bytes type
+            If elements in *data* are neither str nor bytes.
         """
         data = np.atleast_1d(np.array(data, dtype=object))
-
         # check if convertible to number:
         convertible = True
         for val in OrderedDict.fromkeys(data):
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -717,7 +717,7 @@ static PyObject *PyFT2Font_set_text(PyFT2Font *self, PyObject *args, PyObject *k
             codepoints[i] = bytestr[i];
         }
     } else {
-        PyErr_SetString(PyExc_TypeError, "String must be unicode or bytes");
+        PyErr_SetString(PyExc_TypeError, "String must be str or bytes");
         return NULL;
     }
 
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -27,7 +27,7 @@ static int convert_string_enum(PyObject *obj, const char *name, const char **nam
         Py_INCREF(obj);
         bytesobj = obj;
     } else {
-        PyErr_Format(PyExc_TypeError, "%s must be bytes or unicode", name);
+        PyErr_Format(PyExc_TypeError, "%s must be str or bytes", name);
         return 0;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ static PyObject PyFT2Font_set_text(PyFT2Font self, PyObject args, PyObject k`
`717`	`717`	`codepoints[i] = bytestr[i];`
`718`	`718`	`}`
`719`	`719`	`} else {`
`720`		`- PyErr_SetString(PyExc_TypeError, "String must be unicode or bytes");`
	`720`	`+ PyErr_SetString(PyExc_TypeError, "String must be str or bytes");`
`721`	`721`	`return NULL;`
`722`	`722`	`}`
`723`	`723`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ static int convert_string_enum(PyObject obj, const char name, const char **nam`
`27`	`27`	`Py_INCREF(obj);`
`28`	`28`	`bytesobj = obj;`
`29`	`29`	`} else {`
`30`		`- PyErr_Format(PyExc_TypeError, "%s must be bytes or unicode", name);`
	`30`	`+ PyErr_Format(PyExc_TypeError, "%s must be str or bytes", name);`
`31`	`31`	`return 0;`
`32`	`32`	`}`
`33`	`33`