Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcfb986a

Browse files
authored
gh-93937: PyOS_StdioReadline() uses PyConfig.legacy_windows_stdio (#94024)
On Windows, PyOS_StdioReadline() now getsPyConfig.legacy_windows_stdio from _PyOS_ReadlineTState, rather thanusing the deprecated global Py_LegacyWindowsStdioFlag variable.Fix also a compiler warning in Py_SetStandardStreamEncoding().
1 parent7ad6f74 commitcfb986a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

‎Parser/myreadline.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt)
247247
assert(tstate!=NULL);
248248

249249
#ifdefMS_WINDOWS
250-
if (!Py_LegacyWindowsStdioFlag&&sys_stdin==stdin) {
250+
constPyConfig*config=_PyInterpreterState_GetConfig(tstate->interp);
251+
if (!config->legacy_windows_stdio&&sys_stdin==stdin) {
251252
HANDLEhStdIn,hStdErr;
252253

253254
hStdIn=_Py_get_osfhandle_noraise(fileno(sys_stdin));

‎Python/initconfig.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,11 @@ Py_SetStandardStreamEncoding(const char *encoding, const char *errors)
543543
}
544544
#ifdefMS_WINDOWS
545545
if (_Py_StandardStreamEncoding) {
546+
_Py_COMP_DIAG_PUSH
547+
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
546548
/* Overriding the stream encoding implies legacy streams */
547549
Py_LegacyWindowsStdioFlag=1;
550+
_Py_COMP_DIAG_POP
548551
}
549552
#endif
550553

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp