]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-119182: Use public PyUnicodeWriter in time_strftime() (#129207)
authorVictor Stinner <vstinner@python.org>
Thu, 23 Jan 2025 00:18:03 +0000 (01:18 +0100)
committerGitHub <noreply@github.com>
Thu, 23 Jan 2025 00:18:03 +0000 (01:18 +0100)
Replace the private _PyUnicodeWriter API with the public
PyUnicodeWriter API.

Modules/timemodule.c

index 340011fc08b551dfcea23864384fe884b325728e..5d0cd52a93a2d3c23d1ab0557de303750ab01196 100644 (file)
@@ -913,9 +913,10 @@ time_strftime(PyObject *module, PyObject *args)
         PyErr_NoMemory();
         return NULL;
     }
-    _PyUnicodeWriter writer;
-    _PyUnicodeWriter_Init(&writer);
-    writer.overallocate = 1;
+    PyUnicodeWriter *writer = PyUnicodeWriter_Create(0);
+    if (writer == NULL) {
+        goto error;
+    }
     Py_ssize_t i = 0;
     while (i < format_size) {
         fmtlen = 0;
@@ -933,7 +934,7 @@ time_strftime(PyObject *module, PyObject *args)
             if (unicode == NULL) {
                 goto error;
             }
-            if (_PyUnicodeWriter_WriteStr(&writer, unicode) < 0) {
+            if (PyUnicodeWriter_WriteStr(writer, unicode) < 0) {
                 Py_DECREF(unicode);
                 goto error;
             }
@@ -947,18 +948,18 @@ time_strftime(PyObject *module, PyObject *args)
                 break;
             }
         }
-        if (_PyUnicodeWriter_WriteSubstring(&writer, format_arg, start, i) < 0) {
+        if (PyUnicodeWriter_WriteSubstring(writer, format_arg, start, i) < 0) {
             goto error;
         }
     }
 
     PyMem_Free(outbuf);
     PyMem_Free(format);
-    return _PyUnicodeWriter_Finish(&writer);
+    return PyUnicodeWriter_Finish(writer);
 error:
     PyMem_Free(outbuf);
     PyMem_Free(format);
-    _PyUnicodeWriter_Dealloc(&writer);
+    PyUnicodeWriter_Discard(writer);
     return NULL;
 }