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

This reverts commit c64583b6d3e8516a8cd2b5f84fc1e300bfac2206 due to multiple buildbot failures when building it.

diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat
index 2c81a28ce938545769cc4cf2c03950e80c08d1b7..126049f495fe3bd5ba9f97faf2c947a7fe23668e 100644 (file)
--- a/Lib/venv/scripts/nt/activate.bat
+++ b/Lib/venv/scripts/nt/activate.bat
@@ -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="
 )

diff --git a/Misc/NEWS.d/next/Library/2018-11-02-12-01-00.bpo-32409.MFRX2Q.rst b/Misc/NEWS.d/next/Library/2018-11-02-12-01-00.bpo-32409.MFRX2Q.rst
deleted file mode 100644 (file)
index 9b57c5b..0000000
--- a/Misc/NEWS.d/next/Library/2018-11-02-12-01-00.bpo-32409.MFRX2Q.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed implementation of :file:`activate.bat` to handle Unicode contents on
-localized Windows systems (eg. German). Patch by Martin Bijl.
\ No newline at end of file