From: Berker Peksag Date: Tue, 16 May 2017 21:31:39 +0000 (+0300) Subject: bpo-29898: Fix incorrect env variable name (GH-1576) X-Git-Tag: v3.6.2rc1~152 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d267041c40a3ab655676b885c0ba35ed9685848;p=thirdparty%2FPython%2Fcpython.git bpo-29898: Fix incorrect env variable name (GH-1576) It should read PYTHONLEGACYWINDOWSSTDIO as stated in section "Add legacy mode" in PEP 528. (cherry picked from commit 87fa8a780e9045a26c735f085c07bba4b2d0be60) --- diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 08dc311d837b..40a06b9adc06 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -571,7 +571,7 @@ conflict. .. versionchanged:: 3.6 On Windows, the encoding specified by this variable is ignored for interactive - console buffers unless :envvar:`PYTHONLEGACYWINDOWSIOENCODING` is also specified. + console buffers unless :envvar:`PYTHONLEGACYWINDOWSSTDIO` is also specified. Files and pipes redirected through the standard streams are not affected. .. envvar:: PYTHONNOUSERSITE @@ -700,7 +700,7 @@ conflict. .. versionadded:: 3.6 See :pep:`529` for more details. -.. envvar:: PYTHONLEGACYWINDOWSIOENCODING +.. envvar:: PYTHONLEGACYWINDOWSSTDIO If set to a non-empty string, does not use the new console reader and writer. This means that Unicode characters will be encoded according to diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index a696af4a999c..a701cafa6107 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -534,7 +534,7 @@ provide correctly read str objects to Python code. ``sys.stdin``, This change only applies when using an interactive console, and not when redirecting files or pipes. To revert to the previous behaviour for interactive -console use, set :envvar:`PYTHONLEGACYWINDOWSIOENCODING`. +console use, set :envvar:`PYTHONLEGACYWINDOWSSTDIO`. .. seealso::