Skip to content

[librt.strings] Make various methods only accept positional args #20589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JukkaL merged 3 commits into from
Jan 15, 2026
+29 −29
Merged

[librt.strings] Make various methods only accept positional args #20589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f33a58b
Optimize BytesWriter.append Python wrapper
JukkaL Jan 15, 2026
9ffcf81
Optimize additional methods
JukkaL Jan 15, 2026
d966cd3
Update librt.strings stub
JukkaL Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mypy/typeshed/stubs/librt/librt/strings.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ from mypy_extensions import i64, i32, u8

@final
class BytesWriter:
def append(self, /, x: int) -> None: ...
def append(self, x: int, /) -> None: ...
def write(self, b: bytes | bytearray, /) -> None: ...
def getvalue(self) -> bytes: ...
def truncate(self, size: i64, /) -> None: ...
Expand Down
56 changes: 28 additions & 28 deletions mypyc/lib-rt/librt_strings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,15 @@ static PySequenceMethods BytesWriter_as_sequence = {
.sq_ass_item = (ssizeobjargproc)BytesWriter_ass_item,
};

static PyObject* BytesWriter_append(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames);
static PyObject* BytesWriter_write(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames);
static PyObject* BytesWriter_append(PyObject *self, PyObject *const *args, size_t nargs);
static PyObject* BytesWriter_write(PyObject *self, PyObject *const *args, size_t nargs);
static PyObject* BytesWriter_truncate(PyObject *self, PyObject *const *args, size_t nargs);

static PyMethodDef BytesWriter_methods[] = {
{"append", (PyCFunction) BytesWriter_append, METH_FASTCALL | METH_KEYWORDS,
{"append", (PyCFunction) BytesWriter_append, METH_FASTCALL,
PyDoc_STR("Append a single byte to the buffer")
},
{"write", (PyCFunction) BytesWriter_write, METH_FASTCALL | METH_KEYWORDS,
{"write", (PyCFunction) BytesWriter_write, METH_FASTCALL,
PyDoc_STR("Append bytes to the buffer")
},
{"getvalue", (PyCFunction) BytesWriter_getvalue, METH_NOARGS,
Expand Down Expand Up @@ -265,16 +265,16 @@ BytesWriter_write_internal(BytesWriterObject *self, PyObject *value) {
}

static PyObject*
BytesWriter_write(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames) {
static const char * const kwlist[] = {"value", 0};
static CPyArg_Parser parser = {"O:write", kwlist, 0};
PyObject *value;
if (unlikely(!CPyArg_ParseStackAndKeywordsSimple(args, nargs, kwnames, &parser, &value))) {
BytesWriter_write(PyObject *self, PyObject *const *args, size_t nargs) {
if (unlikely(nargs != 1)) {
PyErr_Format(PyExc_TypeError,
"write() takes exactly 1 argument (%zu given)", nargs);
return NULL;
}
if (!check_bytes_writer(self)) {
return NULL;
}
PyObject *value = args[0];
if (unlikely(!PyBytes_Check(value) && !PyByteArray_Check(value))) {
PyErr_SetString(PyExc_TypeError, "value must be a bytes or bytearray object");
return NULL;
Expand All @@ -295,16 +295,16 @@ BytesWriter_append_internal(BytesWriterObject *self, uint8_t value) {
}

static PyObject*
BytesWriter_append(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames) {
static const char * const kwlist[] = {"value", 0};
static CPyArg_Parser parser = {"O:append", kwlist, 0};
PyObject *value;
if (unlikely(!CPyArg_ParseStackAndKeywordsSimple(args, nargs, kwnames, &parser, &value))) {
BytesWriter_append(PyObject *self, PyObject *const *args, size_t nargs) {
if (unlikely(nargs != 1)) {
PyErr_Format(PyExc_TypeError,
"append() takes exactly 1 argument (%zu given)", nargs);
return NULL;
}
if (!check_bytes_writer(self)) {
return NULL;
}
PyObject *value = args[0];
uint8_t unboxed = CPyLong_AsUInt8(value);
if (unlikely(unboxed == CPY_LL_UINT_ERROR && PyErr_Occurred())) {
CPy_TypeError("u8", value);
Expand Down Expand Up @@ -574,14 +574,14 @@ static PySequenceMethods StringWriter_as_sequence = {
.sq_item = (ssizeargfunc)StringWriter_item,
};

static PyObject* StringWriter_append(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames);
static PyObject* StringWriter_write(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames);
static PyObject* StringWriter_append(PyObject *self, PyObject *const *args, size_t nargs);
static PyObject* StringWriter_write(PyObject *self, PyObject *const *args, size_t nargs);

static PyMethodDef StringWriter_methods[] = {
{"append", (PyCFunction) StringWriter_append, METH_FASTCALL | METH_KEYWORDS,
{"append", (PyCFunction) StringWriter_append, METH_FASTCALL,
PyDoc_STR("Append a single character (as int codepoint) to the buffer")
},
{"write", (PyCFunction) StringWriter_write, METH_FASTCALL | METH_KEYWORDS,
{"write", (PyCFunction) StringWriter_write, METH_FASTCALL,
PyDoc_STR("Append a string to the buffer")
},
{"getvalue", (PyCFunction) StringWriter_getvalue, METH_NOARGS,
Expand Down Expand Up @@ -661,16 +661,16 @@ StringWriter_write_internal(StringWriterObject *self, PyObject *value) {
}

static PyObject*
StringWriter_write(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames) {
static const char * const kwlist[] = {"value", 0};
static CPyArg_Parser parser = {"O:write", kwlist, 0};
PyObject *value;
if (unlikely(!CPyArg_ParseStackAndKeywordsSimple(args, nargs, kwnames, &parser, &value))) {
StringWriter_write(PyObject *self, PyObject *const *args, size_t nargs) {
if (unlikely(nargs != 1)) {
PyErr_Format(PyExc_TypeError,
"write() takes exactly 1 argument (%zu given)", nargs);
return NULL;
}
if (!check_string_writer(self)) {
return NULL;
}
PyObject *value = args[0];
if (unlikely(!PyUnicode_Check(value))) {
PyErr_SetString(PyExc_TypeError, "value must be a str object");
return NULL;
Expand Down Expand Up @@ -795,16 +795,16 @@ StringWriter_append_internal(StringWriterObject *self, int32_t value) {
}

static PyObject*
StringWriter_append(PyObject *self, PyObject *const *args, size_t nargs, PyObject *kwnames) {
static const char * const kwlist[] = {"value", 0};
static CPyArg_Parser parser = {"O:append", kwlist, 0};
PyObject *value;
if (unlikely(!CPyArg_ParseStackAndKeywordsSimple(args, nargs, kwnames, &parser, &value))) {
StringWriter_append(PyObject *self, PyObject *const *args, size_t nargs) {
if (unlikely(nargs != 1)) {
PyErr_Format(PyExc_TypeError,
"append() takes exactly 1 argument (%zu given)", nargs);
return NULL;
}
if (!check_string_writer(self)) {
return NULL;
}
PyObject *value = args[0];
int32_t unboxed = CPyLong_AsInt32(value);
if (unlikely(unboxed == CPY_LL_INT_ERROR && PyErr_Occurred())) {
CPy_TypeError("i32", value);
Expand Down
Loading