Rename to PyUnicodeWriter_Format() again

Author: vstinner

Include/cpython/unicodeobject.h

@@ -451,6 +451,7 @@ typedef struct PyUnicodeWriter PyUnicodeWriter;
 PyAPI_FUNC(PyUnicodeWriter*) PyUnicodeWriter_Create(void);
 PyAPI_FUNC(void) PyUnicodeWriter_Free(PyUnicodeWriter *writer);
 PyAPI_FUNC(PyObject*) PyUnicodeWriter_Finish(PyUnicodeWriter *writer);
+
 PyAPI_FUNC(void) PyUnicodeWriter_SetOverallocate(
     PyUnicodeWriter *writer,
     int overallocate);
@@ -462,6 +463,7 @@ PyAPI_FUNC(int) PyUnicodeWriter_WriteString(
     PyUnicodeWriter *writer,
     const char *str,
     Py_ssize_t size);
+
 PyAPI_FUNC(int) PyUnicodeWriter_WriteStr(
     PyUnicodeWriter *writer,
     PyObject *str);
@@ -470,7 +472,7 @@ PyAPI_FUNC(int) PyUnicodeWriter_WriteSubstring(
     PyObject *str,
     Py_ssize_t start,
     Py_ssize_t stop);
-PyAPI_FUNC(int) PyUnicodeWriter_FromFormat(
+PyAPI_FUNC(int) PyUnicodeWriter_Format(
     PyUnicodeWriter *writer,
     const char *format,
     ...);

Modules/_testcapi/unicode.c

@@ -346,8 +346,8 @@ test_unicodewriter_format(PyObject *self, PyObject *Py_UNUSED(args))
         return NULL;
     }
 
-    // test PyUnicodeWriter_FromFormat()
-    if (PyUnicodeWriter_FromFormat(writer, "%s %i", "Hello", 123) < 0) {
+    // test PyUnicodeWriter_Format()
+    if (PyUnicodeWriter_Format(writer, "%s %i", "Hello", 123) < 0) {
         goto error;
     }
 

Objects/unicodeobject.c

@@ -2949,7 +2949,7 @@ PyUnicode_FromFormat(const char *format, ...)
 }
 
 int
-PyUnicodeWriter_FromFormat(PyUnicodeWriter *writer, const char *format, ...)
+PyUnicodeWriter_Format(PyUnicodeWriter *writer, const char *format, ...)
 {
     _PyUnicodeWriter *_writer = (_PyUnicodeWriter*)writer;