summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-05-21 08:41:44 -0700
committerGitHub <noreply@github.com>2019-05-21 08:41:44 -0700
commit3c9c2dc8dde709a5f27c74aff1614d6ed3456964 (patch)
treec58b13f45aea467749e1b15fa85983dea6b29efb
parentcdb2dbfe92b95dcd19ccab1a1e9b8c39263c54b0 (diff)
downloadcpython-git-3c9c2dc8dde709a5f27c74aff1614d6ed3456964.tar.gz
bpo-34144: Fix of venv acvtivate.bat for win 10 (GH-8321)
The script needs to be updated to support win 10/ 1803 chcp.com command (output has trailing dot) https://bugs.python.org/issue34144 (cherry picked from commit 6955d44b41058e3bcc59ff41860bd4cc8948c441) Co-authored-by: Lorenz Mende <Lorenz.mende@gmail.com>
-rw-r--r--Lib/venv/scripts/nt/activate.bat2
-rw-r--r--Misc/NEWS.d/next/Windows/2019-04-10-04-35-31.bpo-34144._KzB5z.rst2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/venv/scripts/nt/activate.bat b/Lib/venv/scripts/nt/activate.bat
index 126049f495..da831bb42c 100644
--- a/Lib/venv/scripts/nt/activate.bat
+++ b/Lib/venv/scripts/nt/activate.bat
@@ -1,7 +1,7 @@
@echo off
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 (
+for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do (
set "_OLD_CODEPAGE=%%a"
)
if defined _OLD_CODEPAGE (
diff --git a/Misc/NEWS.d/next/Windows/2019-04-10-04-35-31.bpo-34144._KzB5z.rst b/Misc/NEWS.d/next/Windows/2019-04-10-04-35-31.bpo-34144._KzB5z.rst
new file mode 100644
index 0000000000..7b8ca821b4
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-04-10-04-35-31.bpo-34144._KzB5z.rst
@@ -0,0 +1,2 @@
+Fixed activate.bat to correctly update codepage when chcp.com returns dots in output.
+Patch by Lorenz Mende.