Skip to content

gh-145142: Make str.maketrans safe under free-threading #145157

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
colesbury merged 13 commits into from
Feb 27, 2026
Merged

gh-145142: Make str.maketrans safe under free-threading #145157

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0745e41
gh-145142: Make str.maketrans safe under free-threading
VanshAgarwal24036 Feb 23, 2026
3fdf54c
Add new line at end of test file
VanshAgarwal24036 Feb 23, 2026
9a75245
Update changes
VanshAgarwal24036 Feb 24, 2026
5071b9d
Add new line at end of news file
VanshAgarwal24036 Feb 24, 2026
b34fd09
Remove unnecessary paranthesis in news file
VanshAgarwal24036 Feb 24, 2026
044c347
Correct build error
VanshAgarwal24036 Feb 24, 2026
b7e9d1b
Update
VanshAgarwal24036 Feb 24, 2026
bfc812a
Add new function
VanshAgarwal24036 Feb 24, 2026
f7c3c45
Update helper fuction
VanshAgarwal24036 Feb 24, 2026
4e715b0
Update function
VanshAgarwal24036 Feb 24, 2026
b60b67c
Perform suggested changes
VanshAgarwal24036 Feb 24, 2026
28af6d8
Fix placement of clinic code
colesbury Feb 27, 2026
4994663
Merge branch 'main' into gh-145142-dict-next-critical-section
colesbury Feb 27, 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
Prev Previous commit
Next Next commit
Add new function
  • Loading branch information
@VanshAgarwal24036
VanshAgarwal24036 committed Feb 24, 2026
commit bfc812a07564c731572248cc666154ecebadaf07
85 changes: 47 additions & 38 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13084,6 +13084,51 @@ character at the same position in y. If there is a third argument, it
must be a string, whose characters will be mapped to None in the result.
[clinic start generated code]*/

static int
unicode_maketrans_from_dict(PyObject *x, PyObject *newdict)

@eendebakpt eendebakpt Feb 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unicode_maketrans_from_dict(PyObject *x, PyObject *newdict)
unicode_maketrans_from_dict_lock_held(PyObject *x, PyObject *newdict)

Naming convention for methods that require locking.

{
PyObject *key, *value;
Py_ssize_t i = 0;
int res;

Py_BEGIN_CRITICAL_SECTION(x);
while (PyDict_Next(x, &i, &key, &value)) {
if (PyUnicode_Check(key)) {
PyObject *newkey;
int kind;
const void *data;
if (PyUnicode_GET_LENGTH(key) != 1) {
PyErr_SetString(PyExc_ValueError, "string keys in translate "
"table must be of length 1");
goto error;
}
kind = PyUnicode_KIND(key);
data = PyUnicode_DATA(key);
newkey = PyLong_FromLong(PyUnicode_READ(kind, data, 0));
if (!newkey)
goto error;
res = PyDict_SetItem(newdict, newkey, value);
Py_DECREF(newkey);
if(res < 0)
goto error;
}
else if (PyLong_Check(key)) {
if (PyDict_SetItem(newdict, key, value) < 0)
goto error;
}
else {
PyErr_SetString(PyExc_TypeError, "keys in translate table must "
"be strings or integers");
goto error;
}
}
Py_END_CRITICAL_SECTION();
return 0;
error:
Py_END_CRITICAL_SECTION();
return -1;
}

static PyObject *
unicode_maketrans_impl(PyObject *x, PyObject *y, PyObject *z)
/*[clinic end generated code: output=a925c89452bd5881 input=7bfbf529a293c6c5]*/
Expand Down Expand Up @@ -13145,51 +13190,15 @@ unicode_maketrans_impl(PyObject *x, PyObject *y, PyObject *z)
}
}
} else {
int kind;
const void *data;

/* x must be a dict */
if (!PyAnyDict_CheckExact(x)) {
PyErr_SetString(PyExc_TypeError, "if you give only one argument "
"to maketrans it must be a dict");
goto err;
}
/* copy entries into the new dict, converting string keys to int keys */
Py_BEGIN_CRITICAL_SECTION(x);
while (PyDict_Next(x, &i, &key, &value)) {
if (PyUnicode_Check(key)) {
/* convert string keys to integer keys */
PyObject *newkey;
if (PyUnicode_GET_LENGTH(key) != 1) {
PyErr_SetString(PyExc_ValueError, "string keys in translate "
"table must be of length 1");
goto error;
}
kind = PyUnicode_KIND(key);
data = PyUnicode_DATA(key);
newkey = PyLong_FromLong(PyUnicode_READ(kind, data, 0));
if (!newkey)
goto error;
res = PyDict_SetItem(new, newkey, value);
Py_DECREF(newkey);
if (res < 0)
goto error;
} else if (PyLong_Check(key)) {
/* just keep integer keys */
if (PyDict_SetItem(new, key, value) < 0)
goto error;
} else {
PyErr_SetString(PyExc_TypeError, "keys in translate table must "
"be strings or integers");
goto error;
}
}
goto done;
error:
Py_CLEAR(new);
done:
Py_END_CRITICAL_SECTION();
return new;
if(unicode_maketrans_from_dict(x, new) < 0)
Comment thread
VanshAgarwal24036 marked this conversation as resolved.
Outdated
goto err;
}
return new;
err:
Expand Down