Skip to content
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

bpo-40521: Add PyInterpreterState.unicode #20081

Merged
merged 1 commit into from
May 13, 2020
Merged

bpo-40521: Add PyInterpreterState.unicode #20081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions Include/internal/pycore_interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@ struct _ceval_state {
#endif
};

/* fs_codec.encoding is initialized to NULL.
Later, it is set to a non-NULL string by _PyUnicode_InitEncodings(). */
struct _Py_unicode_fs_codec {
char *encoding; // Filesystem encoding (encoded to UTF-8)
int utf8; // encoding=="utf-8"?
char *errors; // Filesystem errors (encoded to UTF-8)
_Py_error_handler error_handler;
};

struct _Py_unicode_state {
struct _Py_unicode_fs_codec fs_codec;
};


/* interpreter state */

Expand Down Expand Up @@ -97,14 +110,7 @@ struct _is {
PyObject *codec_error_registry;
int codecs_initialized;

/* fs_codec.encoding is initialized to NULL.
Later, it is set to a non-NULL string by _PyUnicode_InitEncodings(). */
struct {
char *encoding; /* Filesystem encoding (encoded to UTF-8) */
int utf8; /* encoding=="utf-8"? */
char *errors; /* Filesystem errors (encoded to UTF-8) */
_Py_error_handler error_handler;
} fs_codec;
struct _Py_unicode_state unicode;

PyConfig config;
#ifdef HAVE_DLOPEN
Expand Down
2 changes: 1 addition & 1 deletion Modules/_io/textio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ io_check_errors(PyObject *errors)

/* Avoid calling PyCodec_LookupError() before the codec registry is ready:
before_PyUnicode_InitEncodings() is called. */
if (!interp->fs_codec.encoding) {
if (!interp->unicode.fs_codec.encoding) {
return 0;
}

Expand Down
64 changes: 33 additions & 31 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ unicode_check_encoding_errors(const char *encoding, const char *errors)

/* Avoid calling _PyCodec_Lookup() and PyCodec_LookupError() before the
codec registry is ready: before_PyUnicode_InitEncodings() is called. */
if (!interp->fs_codec.encoding) {
if (!interp->unicode.fs_codec.encoding) {
return 0;
}

Expand Down Expand Up @@ -3650,16 +3650,17 @@ PyObject *
PyUnicode_EncodeFSDefault(PyObject *unicode)
{
PyInterpreterState *interp = _PyInterpreterState_GET();
if (interp->fs_codec.utf8) {
struct _Py_unicode_fs_codec *fs_codec = &interp->unicode.fs_codec;
if (fs_codec->utf8) {
return unicode_encode_utf8(unicode,
interp->fs_codec.error_handler,
interp->fs_codec.errors);
fs_codec->error_handler,
fs_codec->errors);
}
#ifndef _Py_FORCE_UTF8_FS_ENCODING
else if (interp->fs_codec.encoding) {
else if (fs_codec->encoding) {
return PyUnicode_AsEncodedString(unicode,
interp->fs_codec.encoding,
interp->fs_codec.errors);
fs_codec->encoding,
fs_codec->errors);
}
#endif
else {
Expand Down Expand Up @@ -3886,17 +3887,18 @@ PyObject*
PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
{
PyInterpreterState *interp = _PyInterpreterState_GET();
if (interp->fs_codec.utf8) {
struct _Py_unicode_fs_codec *fs_codec = &interp->unicode.fs_codec;
if (fs_codec->utf8) {
return unicode_decode_utf8(s, size,
interp->fs_codec.error_handler,
interp->fs_codec.errors,
fs_codec->error_handler,
fs_codec->errors,
NULL);
}
#ifndef _Py_FORCE_UTF8_FS_ENCODING
else if (interp->fs_codec.encoding) {
else if (fs_codec->encoding) {
return PyUnicode_Decode(s, size,
interp->fs_codec.encoding,
interp->fs_codec.errors);
fs_codec->encoding,
fs_codec->errors);
}
#endif
else {
Expand Down Expand Up @@ -16071,16 +16073,17 @@ init_fs_codec(PyInterpreterState *interp)
return -1;
}

PyMem_RawFree(interp->fs_codec.encoding);
interp->fs_codec.encoding = encoding;
struct _Py_unicode_fs_codec *fs_codec = &interp->unicode.fs_codec;
PyMem_RawFree(fs_codec->encoding);
fs_codec->encoding = encoding;
/* encoding has been normalized by init_fs_encoding() */
interp->fs_codec.utf8 = (strcmp(encoding, "utf-8") == 0);
PyMem_RawFree(interp->fs_codec.errors);
interp->fs_codec.errors = errors;
interp->fs_codec.error_handler = error_handler;
fs_codec->utf8 = (strcmp(encoding, "utf-8") == 0);
PyMem_RawFree(fs_codec->errors);
fs_codec->errors = errors;
fs_codec->error_handler = error_handler;

#ifdef _Py_FORCE_UTF8_FS_ENCODING
assert(interp->fs_codec.utf8 == 1);
assert(fs_codec->utf8 == 1);
#endif

/* At this point, PyUnicode_EncodeFSDefault() and
Expand All @@ -16089,8 +16092,8 @@ init_fs_codec(PyInterpreterState *interp)

/* Set Py_FileSystemDefaultEncoding and Py_FileSystemDefaultEncodeErrors
global configuration variables. */
if (_Py_SetFileSystemEncoding(interp->fs_codec.encoding,
interp->fs_codec.errors) < 0) {
if (_Py_SetFileSystemEncoding(fs_codec->encoding,
fs_codec->errors) < 0) {
PyErr_NoMemory();
return -1;
}
Expand Down Expand Up @@ -16133,15 +16136,14 @@ _PyUnicode_InitEncodings(PyThreadState *tstate)


static void
_PyUnicode_FiniEncodings(PyThreadState *tstate)
_PyUnicode_FiniEncodings(struct _Py_unicode_fs_codec *fs_codec)
{
PyInterpreterState *interp = tstate->interp;
PyMem_RawFree(interp->fs_codec.encoding);
interp->fs_codec.encoding = NULL;
interp->fs_codec.utf8 = 0;
PyMem_RawFree(interp->fs_codec.errors);
interp->fs_codec.errors = NULL;
interp->fs_codec.error_handler = _Py_ERROR_UNKNOWN;
PyMem_RawFree(fs_codec->encoding);
fs_codec->encoding = NULL;
fs_codec->utf8 = 0;
PyMem_RawFree(fs_codec->errors);
fs_codec->errors = NULL;
fs_codec->error_handler = _Py_ERROR_UNKNOWN;
}


Expand Down Expand Up @@ -16199,7 +16201,7 @@ _PyUnicode_Fini(PyThreadState *tstate)
unicode_clear_static_strings();
}

_PyUnicode_FiniEncodings(tstate);
_PyUnicode_FiniEncodings(&tstate->interp->unicode.fs_codec);
}


Expand Down