Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-07 02:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "bpo-32409: Fix regression in activate.bat on international Windows (GH-10295)" (GH-10403)

Browse source 
This reverts commit c64583b6d3 due to multiple buildbot failures when building it.
(cherry picked from commit 6843ffe453)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
This commit is contained in:
Miss Islington (bot) 2018-11-07 16:13:58 -08:00 • committed by GitHub
parent b097f9fe2b
commit 3ba5e253de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/venv/scripts/nt/activate.bat
View file

@ -1,10 +1,11 @@
@echo off
rem This file is UTF-8 encoded, so we need to update the current code page while executing it.
for /f %%a in ('%~dp0python.exe -Ic "import ctypes; print(ctypes.windll.kernel32.GetConsoleOutputCP())"') do (set "_OLD_CODEPAGE=%%a")
rem This file is UTF-8 encoded, so we need to update the current code page while executing it
for /f "tokens=2 delims=:" %%a in ('"%SystemRoot%\System32\chcp.com"') do (
set "_OLD_CODEPAGE=%%a"
)
if defined _OLD_CODEPAGE (
%~dp0python.exe -Ic "import ctypes; ctypes.windll.kernel32.SetConsoleOutputCP(65001)"
"%SystemRoot%\System32\chcp.com" 65001 > nul
)
set "VIRTUAL_ENV=__VENV_DIR__"
@ -39,6 +40,6 @@ set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
:END
if defined _OLD_CODEPAGE (
%~dp0python.exe -Ic "import ctypes; ctypes.windll.kernel32.SetConsoleOutputCP(%_OLD_CODEPAGE%)"
"%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
set "_OLD_CODEPAGE="
)

2
Misc/NEWS.d/next/Library/2018-11-02-12-01-00.bpo-32409.MFRX2Q.rst
View file

@ -1,2 +0,0 @@
Fixed implementation of :file:`activate.bat` to handle Unicode contents on
localized Windows systems (eg. German). Patch by Martin Bijl.