Skip to content

bpo-32409 Ensures activate.bat can handle Unicode contents #10295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2018
Merged

bpo-32409 Ensures activate.bat can handle Unicode contents #10295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Lib/venv/scripts/nt/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
@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 (
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 %%a in ('%~dp0python.exe -Ic "import ctypes; print(ctypes.windll.kernel32.GetConsoleOutputCP())"') do (set "_OLD_CODEPAGE=%%a")

if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" 65001 > nul
%~dp0python.exe -Ic "import ctypes; ctypes.windll.kernel32.SetConsoleOutputCP(65001)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the tracker @zooba pointed that you're missing the quoting around %~dp0python.exe. I don't think the issue with the buildbot failures is related to spaces in the path, but remember to fix this problem as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. I will do that. I will wait a few days until the design is cleared. My assumptions now are:

  • we need a new PR starting of the up-to-date master
  • we need to address the case that ctypes is not available with chcp.com
  • we need quoting to support spaces in folder names
  • we need to inject the python_exe name by a as a template variable such as VENV_PYTHON_EXE_NAME, assuming that this name is always ASCII
  • we need a fallback in case VENV_PYTHON_EXE_NAME is not available

Please correct me where you differ. I will make the PR as soon as you agree on the solution. Sorry to have broken the build.

)

set "VIRTUAL_ENV=__VENV_DIR__"
Expand Down Expand Up @@ -40,6 +39,6 @@ set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"

:END
if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
%~dp0python.exe -Ic "import ctypes; ctypes.windll.kernel32.SetConsoleOutputCP(%_OLD_CODEPAGE%)"
set "_OLD_CODEPAGE="
)
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-11-02-12-01-00.bpo-32409.MFRX2Q.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed implementation of :file:`activate.bat` to handle Unicode contents on
localized Windows systems (eg. German). Patch by Martin Bijl.