Rename to PyUnicodeWriter_WriteUTF8()

Author: vstinner

Include/cpython/unicodeobject.h

@@ -459,12 +459,12 @@ PyAPI_FUNC(void) PyUnicodeWriter_SetOverallocate(
 PyAPI_FUNC(int) PyUnicodeWriter_WriteChar(
     PyUnicodeWriter *writer,
     Py_UCS4 ch);
-PyAPI_FUNC(int) PyUnicodeWriter_WriteString(
+PyAPI_FUNC(int) PyUnicodeWriter_WriteUTF8(
     PyUnicodeWriter *writer,
     const char *str,
     Py_ssize_t size);
 
-PyAPI_FUNC(int) PyUnicodeWriter_WriteStr(
+PyAPI_FUNC(int) PyUnicodeWriter_WriteString(
     PyUnicodeWriter *writer,
     PyObject *str);
 PyAPI_FUNC(int) PyUnicodeWriter_WriteSubstring(

Modules/_testcapi/unicode.c

@@ -232,12 +232,12 @@ test_unicodewriter(PyObject *self, PyObject *Py_UNUSED(args))
     // test PyUnicodeWriter_SetOverallocate()
     PyUnicodeWriter_SetOverallocate(writer, 1);
 
-    // test PyUnicodeWriter_WriteStr()
+    // test PyUnicodeWriter_WriteString()
     PyObject *str = PyUnicode_FromString("var");
     if (str == NULL) {
         goto error;
     }
-    int ret = PyUnicodeWriter_WriteStr(writer, str);
+    int ret = PyUnicodeWriter_WriteString(writer, str);
     Py_CLEAR(str);
     if (ret < 0) {
         goto error;
@@ -259,8 +259,8 @@ test_unicodewriter(PyObject *self, PyObject *Py_UNUSED(args))
         goto error;
     }
 
-    // test PyUnicodeWriter_WriteString()
-    if (PyUnicodeWriter_WriteString(writer, " value", 6) < 0) {
+    // test PyUnicodeWriter_WriteUTF8()
+    if (PyUnicodeWriter_WriteUTF8(writer, " value", 6) < 0) {
         goto error;
     }
 
@@ -286,19 +286,19 @@ test_unicodewriter_utf8(PyObject *self, PyObject *Py_UNUSED(args))
     if (writer == NULL) {
         return NULL;
     }
-    if (PyUnicodeWriter_WriteString(writer, "ascii", -1) < 0) {
+    if (PyUnicodeWriter_WriteUTF8(writer, "ascii", -1) < 0) {
         goto error;
     }
     if (PyUnicodeWriter_WriteChar(writer, '-') < 0) {
         goto error;
     }
-    if (PyUnicodeWriter_WriteString(writer, "latin1=\xC3\xA9", -1) < 0) {
+    if (PyUnicodeWriter_WriteUTF8(writer, "latin1=\xC3\xA9", -1) < 0) {
         goto error;
     }
     if (PyUnicodeWriter_WriteChar(writer, '-') < 0) {
         goto error;
     }
-    if (PyUnicodeWriter_WriteString(writer, "euro=\xE2\x82\xAC", -1) < 0) {
+    if (PyUnicodeWriter_WriteUTF8(writer, "euro=\xE2\x82\xAC", -1) < 0) {
         goto error;
     }
     if (PyUnicodeWriter_WriteChar(writer, '.') < 0) {
@@ -328,7 +328,7 @@ test_unicodewriter_invalid_utf8(PyObject *self, PyObject *Py_UNUSED(args))
     if (writer == NULL) {
         return NULL;
     }
-    assert(PyUnicodeWriter_WriteString(writer, "invalid=\xFF", -1) < 0);
+    assert(PyUnicodeWriter_WriteUTF8(writer, "invalid=\xFF", -1) < 0);
     PyUnicodeWriter_Free(writer);
 
     assert(PyErr_ExceptionMatches(PyExc_UnicodeDecodeError));

Objects/unicodeobject.c

@@ -4946,7 +4946,7 @@ unicode_decode_utf8(const char *s, Py_ssize_t size,
 }
 
 
-// Used by PyUnicodeWriter_WriteString() implementation
+// Used by PyUnicodeWriter_WriteUTF8() implementation
 static int
 unicode_decode_utf8_writer(_PyUnicodeWriter *writer,
                            const char *s, Py_ssize_t size,
@@ -13401,7 +13401,7 @@ _PyUnicodeWriter_WriteStr(_PyUnicodeWriter *writer, PyObject *str)
 }
 
 int
-PyUnicodeWriter_WriteStr(PyUnicodeWriter *writer, PyObject *str)
+PyUnicodeWriter_WriteString(PyUnicodeWriter *writer, PyObject *str)
 {
     if (!PyUnicode_Check(str)) {
         PyErr_Format(PyExc_TypeError, "expect str, not %T", str);
@@ -13527,9 +13527,9 @@ _PyUnicodeWriter_WriteASCIIString(_PyUnicodeWriter *writer,
 }
 
 int
-PyUnicodeWriter_WriteString(PyUnicodeWriter *writer,
-                            const char *str,
-                            Py_ssize_t size)
+PyUnicodeWriter_WriteUTF8(PyUnicodeWriter *writer,
+                          const char *str,
+                          Py_ssize_t size)
 {
     if (size == -1) {
         size = strlen(str);