bpo-36634: Fixes activate.bat when existing values contain double quo… · python/cpython@8a19a91 (original) (raw)

Original file line number Diff line number Diff line change
@@ -2,44 +2,32 @@
2 2
3 3 rem This file is UTF-8 encoded, so we need to update the current code page while executing it
4 4 for /f "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do (
5 -set "_OLD_CODEPAGE=%%a"
5 +set _OLD_CODEPAGE=%%a
6 6 )
7 7 if defined _OLD_CODEPAGE (
8 8 "%SystemRoot%\System32\chcp.com" 65001 > nul
9 9 )
10 10
11 -set "VIRTUAL_ENV=__VENV_DIR__"
11 +set VIRTUAL_ENV=__VENV_DIR__
12 12
13 -if not defined PROMPT (
14 -set "PROMPT=$P$G"
15 -)
16 -
17 -if defined _OLD_VIRTUAL_PROMPT (
18 -set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
19 -)
13 +if not defined PROMPT set PROMPT=$P$G
20 14
21 -if defined _OLD_VIRTUAL_PYTHONHOME (
22 -set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
23 -)
15 +if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT%
16 +if defined _OLD_VIRTUAL_PYTHONHOME set PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%
24 17
25 -set "_OLD_VIRTUAL_PROMPT=%PROMPT%"
26 -set "PROMPT=__VENV_PROMPT__%PROMPT%"
18 +set _OLD_VIRTUAL_PROMPT=%PROMPT%
19 +set PROMPT=__VENV_PROMPT__%PROMPT%
27 20
28 -if defined PYTHONHOME (
29 -set "_OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%"
30 -set PYTHONHOME=
31 -)
21 +if defined PYTHONHOME set _OLD_VIRTUAL_PYTHONHOME=%PYTHONHOME%
22 +set PYTHONHOME=
32 23
33 -if defined _OLD_VIRTUAL_PATH (
34 -set "PATH=%_OLD_VIRTUAL_PATH%"
35 -) else (
36 -set "_OLD_VIRTUAL_PATH=%PATH%"
37 -)
24 +if defined _OLD_VIRTUAL_PATH set PATH=%_OLD_VIRTUAL_PATH%
25 +else set _OLD_VIRTUAL_PATH=%PATH%
38 26
39 -set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
27 +set PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%
40 28
41 29 :END
42 30 if defined _OLD_CODEPAGE (
43 31 "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
44 -set "_OLD_CODEPAGE="
32 +set _OLD_CODEPAGE=
45 33 )