mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 20:28:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

gh-119182: Use public PyUnicodeWriter in stringio.c (#129243)

Browse source 
Replace the private _PyUnicodeWriter API with the public
PyUnicodeWriter API.
This commit is contained in:
Victor Stinner 2025-01-24 00:31:49 +01:00 • committed by GitHub
parent bab8918f9a
commit 732670d93b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Modules/_io/stringio.c
View file

@ -30,7 +30,7 @@ typedef struct {
_PyUnicodeWriter is destroyed. _PyUnicodeWriter is destroyed.
*/ */
int state; int state;
_PyUnicodeWriter writer; PyUnicodeWriter *writer;
char ok; /* initialized? */ char ok; /* initialized? */
char closed; char closed;
@ -129,14 +129,18 @@ resize_buffer(stringio *self, size_t size)
static PyObject * static PyObject *
make_intermediate(stringio *self) make_intermediate(stringio *self)
{ {
PyObject *intermediate = _PyUnicodeWriter_Finish(&self->writer); PyObject *intermediate = PyUnicodeWriter_Finish(self->writer);
self->writer = NULL;
self->state = STATE_REALIZED; self->state = STATE_REALIZED;
if (intermediate == NULL) if (intermediate == NULL)
return NULL; return NULL;
_PyUnicodeWriter_Init(&self->writer); self->writer = PyUnicodeWriter_Create(0);
self->writer.overallocate = 1; if (self->writer == NULL) {
if (_PyUnicodeWriter_WriteStr(&self->writer, intermediate)) { Py_DECREF(intermediate);
return NULL;
}
if (PyUnicodeWriter_WriteStr(self->writer, intermediate)) {
Py_DECREF(intermediate); Py_DECREF(intermediate);
return NULL; return NULL;
} }
@ -155,7 +159,8 @@ realize(stringio *self)
assert(self->state == STATE_ACCUMULATING); assert(self->state == STATE_ACCUMULATING);
self->state = STATE_REALIZED; self->state = STATE_REALIZED;
intermediate = _PyUnicodeWriter_Finish(&self->writer); intermediate = PyUnicodeWriter_Finish(self->writer);
self->writer = NULL;
if (intermediate == NULL) if (intermediate == NULL)
return -1; return -1;
@ -217,7 +222,7 @@ write_str(stringio *self, PyObject *obj)
if (self->state == STATE_ACCUMULATING) { if (self->state == STATE_ACCUMULATING) {
if (self->string_size == self->pos) { if (self->string_size == self->pos) {
if (_PyUnicodeWriter_WriteStr(&self->writer, decoded)) if (PyUnicodeWriter_WriteStr(self->writer, decoded))
goto fail; goto fail;
goto success; goto success;
} }
@ -577,7 +582,8 @@ _io_StringIO_close_impl(stringio *self)
/* Free up some memory */ /* Free up some memory */
if (resize_buffer(self, 0) < 0) if (resize_buffer(self, 0) < 0)
return NULL; return NULL;
_PyUnicodeWriter_Dealloc(&self->writer); PyUnicodeWriter_Discard(self->writer);
self->writer = NULL;
Py_CLEAR(self->readnl); Py_CLEAR(self->readnl);
Py_CLEAR(self->writenl); Py_CLEAR(self->writenl);
Py_CLEAR(self->decoder); Py_CLEAR(self->decoder);
@ -615,7 +621,7 @@ stringio_dealloc(stringio *self)
PyMem_Free(self->buf); PyMem_Free(self->buf);
self->buf = NULL; self->buf = NULL;
} }
_PyUnicodeWriter_Dealloc(&self->writer); PyUnicodeWriter_Discard(self->writer);
(void)stringio_clear(self); (void)stringio_clear(self);
if (self->weakreflist != NULL) { if (self->weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject *) self); PyObject_ClearWeakRefs((PyObject *) self);
@ -699,7 +705,8 @@ _io_StringIO___init___impl(stringio *self, PyObject *value,
self->ok = 0; self->ok = 0;
_PyUnicodeWriter_Dealloc(&self->writer); PyUnicodeWriter_Discard(self->writer);
self->writer = NULL;
Py_CLEAR(self->readnl); Py_CLEAR(self->readnl);
Py_CLEAR(self->writenl); Py_CLEAR(self->writenl);
Py_CLEAR(self->decoder); Py_CLEAR(self->decoder);
@ -754,8 +761,10 @@ _io_StringIO___init___impl(stringio *self, PyObject *value,
/* Empty stringio object, we can start by accumulating */ /* Empty stringio object, we can start by accumulating */
if (resize_buffer(self, 0) < 0) if (resize_buffer(self, 0) < 0)
return -1; return -1;
_PyUnicodeWriter_Init(&self->writer); self->writer = PyUnicodeWriter_Create(0);
self->writer.overallocate = 1; if (self->writer == NULL) {
return -1;
}
self->state = STATE_ACCUMULATING; self->state = STATE_ACCUMULATING;
} }
self->pos = 0; self->pos = 0;