Skip to content

gh-117709: Add vectorcall support to str() #117725

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

Closed
erlend-aasland wants to merge 10 commits into from
Closed

gh-117709: Add vectorcall support to str() #117725

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fbbf5f3
PoC: str vectorcall
erlend-aasland Apr 10, 2024
2a94bfa
Nicer error message
erlend-aasland Apr 10, 2024
1a29140
NEWS
erlend-aasland Apr 10, 2024
311aa3c
Don't call unicode_get_empty() directly; remove some unneeded assignm…
erlend-aasland Apr 10, 2024
c59478c
type is always PyUnicode_Type?
erlend-aasland Apr 10, 2024
10804c6
Pull in main
erlend-aasland Apr 11, 2024
068de64
Address review: variable naming
erlend-aasland Apr 11, 2024
57c01a4
Align exception messages with tp_call
erlend-aasland Apr 11, 2024
37b45ed
Address review: use better internal APIs
erlend-aasland Apr 11, 2024
7e141e7
Address review: explcitly initialise variables
erlend-aasland Apr 11, 2024
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
Prev Previous commit
Next Next commit
Nicer error message
  • Loading branch information
@erlend-aasland
erlend-aasland committed Apr 10, 2024
commit 2a94bfa7da458364a4dee2a6a6c1a695aa9cee26
16 changes: 9 additions & 7 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14618,10 +14618,12 @@ unicode_new_impl(PyTypeObject *type, PyObject *x, const char *encoding,
}

static const char *
as_const_char(PyObject *obj)
as_const_char(PyObject *obj, const char *name)
{
if (!PyUnicode_Check(obj)) {
_PyArg_BadArgument("str", "argument", "str", obj);
PyErr_Format(PyExc_TypeError,
"str() argument '%s' must be str, not %T",
name, obj);
return NULL;
}
Py_ssize_t sz;
Expand Down Expand Up @@ -14684,14 +14686,14 @@ unicode_vectorcall(PyObject *type, PyObject *const *args,
if (nkwargs == 1) {
PyObject *kw0 = PyTuple_GET_ITEM(kwnames, 0);
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
if (_PyUnicode_EqualToASCIIString(kw0, "encoding")) {
encoding = as_const_char(args[1]);
encoding = as_const_char(args[1], "encoding");
if (encoding == NULL) {
return NULL;
}
errors = NULL;
}
else if (_PyUnicode_EqualToASCIIString(kw0, "errors")) {
errors = as_const_char(args[1]);
errors = as_const_char(args[1], "errors");
if (errors == NULL) {
return NULL;
}
Expand All @@ -14704,7 +14706,7 @@ unicode_vectorcall(PyObject *type, PyObject *const *args,
}
}
else if (nkwargs == 0) {
encoding = as_const_char(args[1]);
encoding = as_const_char(args[1], "encoding");
errors = NULL;
}
else {
Expand All @@ -14726,11 +14728,11 @@ unicode_vectorcall(PyObject *type, PyObject *const *args,
return fallback_to_tp_call(type, nargs, nkwargs, args, kwnames);
}
PyObject *object = args[0];
const char *encoding = as_const_char(args[1]);
const char *encoding = as_const_char(args[1], "encoding");
if (encoding == NULL) {
return NULL;
}
const char *errors = as_const_char(args[2]);
const char *errors = as_const_char(args[2], "errors");
if (errors == NULL) {
return NULL;
}
Expand Down