diff options
author | Victor Stinner <vstinner@python.org> | 2020-04-13 01:04:28 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-13 01:04:28 (GMT) |
commit | da7933ecc30e37b119756cb02b89a6ad99db22e0 (patch) | |
tree | e6c7227f2ded7b7354fb027342fa977f70808d10 /Modules/_io | |
parent | 14d5331eb5e6c38be12bad421bd59ad0fac9e448 (diff) | |
download | cpython-da7933ecc30e37b119756cb02b89a6ad99db22e0.zip cpython-da7933ecc30e37b119756cb02b89a6ad99db22e0.tar.gz cpython-da7933ecc30e37b119756cb02b89a6ad99db22e0.tar.bz2 |
bpo-40268: Add _PyInterpreterState_GetConfig() (GH-19492)
Don't access PyInterpreterState.config member directly anymore, but
use new functions:
* _PyInterpreterState_GetConfig()
* _PyInterpreterState_SetConfig()
* _Py_GetConfig()
Diffstat (limited to 'Modules/_io')
-rw-r--r-- | Modules/_io/_iomodule.c | 3 | ||||
-rw-r--r-- | Modules/_io/iobase.c | 3 | ||||
-rw-r--r-- | Modules/_io/textio.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index e880992..571f225 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -9,7 +9,6 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "pycore_pystate.h" /* _PyInterpreterState_GET_UNSAFE() */ #include "structmember.h" #include "_iomodule.h" @@ -377,7 +376,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode, { PyObject *RawIO_class = (PyObject *)&PyFileIO_Type; #ifdef MS_WINDOWS - PyConfig *config = &_PyInterpreterState_GET_UNSAFE()->config; + const PyConfig *config = _Py_GetConfig(); if (!config->legacy_windows_stdio && _PyIO_get_console_type(path_or_fd) != '\0') { RawIO_class = (PyObject *)&PyWindowsConsoleIO_Type; encoding = "utf-8"; diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index 1ff3564..924ffb5 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -287,8 +287,7 @@ iobase_finalize(PyObject *self) shutdown issues). */ if (res == NULL) { #ifndef Py_DEBUG - const PyConfig *config = &_PyInterpreterState_GET_UNSAFE()->config; - if (config->dev_mode) { + if (_Py_GetConfig()->dev_mode) { PyErr_WriteUnraisable(self); } else { diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 92d6faa..492988e 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -9,6 +9,7 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" #include "pycore_object.h" +#include "pycore_pystate.h" #include "structmember.h" #include "_iomodule.h" @@ -996,7 +997,7 @@ io_check_errors(PyObject *errors) PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE(); #ifndef Py_DEBUG /* In release mode, only check in development mode (-X dev) */ - if (!interp->config.dev_mode) { + if (!_PyInterpreterState_GetConfig(interp)->dev_mode) { return 0; } #else |