Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-93937: PyOS_StdioReadline() uses PyConfig.legacy_windows_stdio (#94024) 

On Windows, PyOS_StdioReadline() now gets
PyConfig.legacy_windows_stdio from _PyOS_ReadlineTState, rather than
using the deprecated global Py_LegacyWindowsStdioFlag variable.

Fix also a compiler warning in Py_SetStandardStreamEncoding().
This commit is contained in:
Victor Stinner 2022-06-20 16:10:47 +02:00 committed by GitHub
parent 7ad6f74fcf
commit cfb986a1a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Parser/myreadline.c
View File

@ -247,7 +247,8 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt)
assert(tstate != NULL); assert(tstate != NULL);
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
if (!Py_LegacyWindowsStdioFlag && sys_stdin == stdin) { const PyConfig *config = _PyInterpreterState_GetConfig(tstate->interp);
if (!config->legacy_windows_stdio && sys_stdin == stdin) {
HANDLE hStdIn, hStdErr; HANDLE hStdIn, hStdErr;
hStdIn = _Py_get_osfhandle_noraise(fileno(sys_stdin)); hStdIn = _Py_get_osfhandle_noraise(fileno(sys_stdin));

3
Python/initconfig.c
View File

@ -543,8 +543,11 @@ Py_SetStandardStreamEncoding(const char *encoding, const char *errors)
} }
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
if (_Py_StandardStreamEncoding) { if (_Py_StandardStreamEncoding) {
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
/* Overriding the stream encoding implies legacy streams */ /* Overriding the stream encoding implies legacy streams */
Py_LegacyWindowsStdioFlag = 1; Py_LegacyWindowsStdioFlag = 1;
_Py_COMP_DIAG_POP
} }
#endif #endif