Rename to PyUnicodeWriter_FromFormat()

vstinner · vstinner · commit 8de16a13a54d · 2024-05-20T13:28:48.000-04:00
diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h
@@ -470,7 +470,7 @@ PyAPI_FUNC(int) PyUnicodeWriter_WriteSubstring(
     PyObject *str,
     Py_ssize_t start,
     Py_ssize_t stop);
-PyAPI_FUNC(int) PyUnicodeWriter_Format(
+PyAPI_FUNC(int) PyUnicodeWriter_FromFormat(
     PyUnicodeWriter *writer,
     const char *format,
     ...);
diff --git a/Modules/_testcapi/unicode.c b/Modules/_testcapi/unicode.c
@@ -249,21 +249,26 @@ test_unicodewriter(PyObject *self, PyObject *Py_UNUSED(args))
     }
 
     // test PyUnicodeWriter_WriteSubstring()
-    str = PyUnicode_FromString("[value]");
+    str = PyUnicode_FromString("[long]");
     if (str == NULL) {
         goto error;
     }
-    ret = PyUnicodeWriter_WriteSubstring(writer, str, 1, 6);
+    ret = PyUnicodeWriter_WriteSubstring(writer, str, 1, 5);
     Py_CLEAR(str);
     if (ret < 0) {
         goto error;
     }
 
+    // test PyUnicodeWriter_WriteASCIIString()
+    if (PyUnicodeWriter_WriteASCIIString(writer, " value", 6) < 0) {
+        goto error;
+    }
+
     PyObject *result = PyUnicodeWriter_Finish(writer);
     if (result == NULL) {
         return NULL;
     }
-    assert(PyUnicode_EqualToUTF8(result, "var=value"));
+    assert(PyUnicode_EqualToUTF8(result, "var=long value"));
     Py_DECREF(result);
 
     Py_RETURN_NONE;
@@ -282,8 +287,8 @@ test_unicodewriter_format(PyObject *self, PyObject *Py_UNUSED(args))
         return NULL;
     }
 
-    // test PyUnicodeWriter_Format()
-    if (PyUnicodeWriter_Format(writer, "%s %i", "Hello", 123) < 0) {
+    // test PyUnicodeWriter_FromFormat()
+    if (PyUnicodeWriter_FromFormat(writer, "%s %i", "Hello", 123) < 0) {
         goto error;
     }
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -2938,7 +2938,7 @@ PyUnicode_FromFormat(const char *format, ...)
 }
 
 int
-PyUnicodeWriter_Format(PyUnicodeWriter *writer, const char *format, ...)
+PyUnicodeWriter_FromFormat(PyUnicodeWriter *writer, const char *format, ...)
 {
     _PyUnicodeWriter *_writer = (_PyUnicodeWriter*)writer;
 

Original file line number	Diff line number	Diff line change
`@@ -2938,7 +2938,7 @@ PyUnicode_FromFormat(const char *format, ...)`
`2938`	`2938`	`}`
`2939`	`2939`
`2940`	`2940`	`int`
`2941`		`-PyUnicodeWriter_Format(PyUnicodeWriter writer, const char format, ...)`
	`2941`	`+PyUnicodeWriter_FromFormat(PyUnicodeWriter writer, const char format, ...)`
`2942`	`2942`	`{`
`2943`	`2943`	`_PyUnicodeWriter _writer = (_PyUnicodeWriter)writer;`
`2944`	`2944`