languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-05 00:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

gh-119182: Use public PyUnicodeWriter in contextvar_tp_repr() (#120809)

Browse source 
The public PyUnicodeWriter API enables overallocation by default and
so is more efficient. It also makes the code simpler and shorter.
This commit is contained in:
Victor Stinner 2024-06-20 21:56:47 +02:00 committed by GitHub
parent 5150795b1c
commit 56657f6be2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Python/context.c
View file

@ -893,56 +893,39 @@ contextvar_tp_hash(PyContextVar *self)
static PyObject *
contextvar_tp_repr(PyContextVar *self)
{
_PyUnicodeWriter writer;
_PyUnicodeWriter_Init(&writer);
if (_PyUnicodeWriter_WriteASCIIString(
&writer, "<ContextVar name=", 17) < 0)
{
goto error;
// Estimation based on the shortest name and default value,
// but maximize the pointer size.
// "<ContextVar name='a' at 0x1234567812345678>"
// "<ContextVar name='a' default=1 at 0x1234567812345678>"
Py_ssize_t estimate = self->var_default ? 53 : 43;
PyUnicodeWriter *writer = PyUnicodeWriter_Create(estimate);
if (writer == NULL) {
return NULL;
}
PyObject *name = PyObject_Repr(self->var_name);
if (name == NULL) {
if (PyUnicodeWriter_WriteUTF8(writer, "<ContextVar name=", 17) < 0) {
goto error;
}
if (_PyUnicodeWriter_WriteStr(&writer, name) < 0) {
Py_DECREF(name);
if (PyUnicodeWriter_WriteRepr(writer, self->var_name) < 0) {
goto error;
}
Py_DECREF(name);
if (self->var_default != NULL) {
if (_PyUnicodeWriter_WriteASCIIString(&writer, " default=", 9) < 0) {
if (PyUnicodeWriter_WriteUTF8(writer, " default=", 9) < 0) {
goto error;
}
PyObject *def = PyObject_Repr(self->var_default);
if (def == NULL) {
if (PyUnicodeWriter_WriteRepr(writer, self->var_default) < 0) {
goto error;
}
if (_PyUnicodeWriter_WriteStr(&writer, def) < 0) {
Py_DECREF(def);
goto error;
}
Py_DECREF(def);
}
PyObject *addr = PyUnicode_FromFormat(" at %p>", self);
if (addr == NULL) {
if (PyUnicodeWriter_Format(writer, " at %p>", self) < 0) {
goto error;
}
if (_PyUnicodeWriter_WriteStr(&writer, addr) < 0) {
Py_DECREF(addr);
goto error;
}
Py_DECREF(addr);
return _PyUnicodeWriter_Finish(&writer);
return PyUnicodeWriter_Finish(writer);
error:
_PyUnicodeWriter_Dealloc(&writer);
PyUnicodeWriter_Discard(writer);
return NULL;
}