Skip to content

Commit

Permalink
pythongh-106182: sys: Intern getfilesystemencoding() and getfilesyste…
Browse files Browse the repository at this point in the history
…mencodeerrors() (python#106183)

sys: Intern getfilesystemencoding() and getfilesystemencodeerrors()
  • Loading branch information
methane authored Jun 30, 2023
1 parent 77ddc9a commit f1034ba
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:func:`sys.getfilesystemencoding` and :mod:`sys.getfilesystemencodeerrors`
now return interned Unicode object.
30 changes: 25 additions & 5 deletions Python/sysmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,13 @@ sys_exit_impl(PyObject *module, PyObject *status)
}


static PyObject *
get_utf8_unicode(void)
{
_Py_DECLARE_STR(utf_8, "utf-8");
PyObject *ret = &_Py_STR(utf_8);
return Py_NewRef(ret);
}

/*[clinic input]
sys.getdefaultencoding
Expand All @@ -874,9 +881,7 @@ static PyObject *
sys_getdefaultencoding_impl(PyObject *module)
/*[clinic end generated code: output=256d19dfcc0711e6 input=d416856ddbef6909]*/
{
_Py_DECLARE_STR(utf_8, "utf-8");
PyObject *ret = &_Py_STR(utf_8);
return Py_NewRef(ret);
return get_utf8_unicode();
}

/*[clinic input]
Expand All @@ -891,7 +896,17 @@ sys_getfilesystemencoding_impl(PyObject *module)
{
PyInterpreterState *interp = _PyInterpreterState_GET();
const PyConfig *config = _PyInterpreterState_GetConfig(interp);
return PyUnicode_FromWideChar(config->filesystem_encoding, -1);

if (wcscmp(config->filesystem_encoding, L"utf-8") == 0) {
return get_utf8_unicode();
}

PyObject *u = PyUnicode_FromWideChar(config->filesystem_encoding, -1);
if (u == NULL) {
return NULL;
}
_PyUnicode_InternInPlace(interp, &u);
return u;
}

/*[clinic input]
Expand All @@ -906,7 +921,12 @@ sys_getfilesystemencodeerrors_impl(PyObject *module)
{
PyInterpreterState *interp = _PyInterpreterState_GET();
const PyConfig *config = _PyInterpreterState_GetConfig(interp);
return PyUnicode_FromWideChar(config->filesystem_errors, -1);
PyObject *u = PyUnicode_FromWideChar(config->filesystem_errors, -1);
if (u == NULL) {
return NULL;
}
_PyUnicode_InternInPlace(interp, &u);
return u;
}

/*[clinic input]
Expand Down

0 comments on commit f1034ba

Please sign in to comment.