summaryrefslogtreecommitdiffstats
path: root/Modules/_io
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-05-14 15:34:56 (GMT)
committerGitHub <noreply@github.com>2019-05-14 15:34:56 (GMT)
commitc96be811fa7da8ddcea18cc7abcae94e0f5ff966 (patch)
treef3c6833ba92a084dc604498aecef6ef9103d6dfa /Modules/_io
parent3c93153f7db5dd9b06f229e61978fd9199b3c097 (diff)
downloadcpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.zip
cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.tar.gz
cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.tar.bz2
bpo-36900: Replace global conf vars with config (GH-13299)
Replace global configuration variables with core_config read from the current interpreter. Cleanup dynload_hpux.c.
Diffstat (limited to 'Modules/_io')
-rw-r--r--Modules/_io/_iomodule.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index d482142..590d6ce 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -9,6 +9,7 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
+#include "pycore_pystate.h" /* _PyInterpreterState_GET_UNSAFE() */
#include "structmember.h"
#include "_iomodule.h"
@@ -376,7 +377,8 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
{
PyObject *RawIO_class = (PyObject *)&PyFileIO_Type;
#ifdef MS_WINDOWS
- if (!Py_LegacyWindowsStdioFlag && _PyIO_get_console_type(path_or_fd) != '\0') {
+ _PyCoreConfig *config = &_PyInterpreterState_GET_UNSAFE()->core_config;
+ if (!config->legacy_windows_stdio && _PyIO_get_console_type(path_or_fd) != '\0') {
RawIO_class = (PyObject *)&PyWindowsConsoleIO_Type;
encoding = "utf-8";
}