Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
574b324b
Commit
574b324b
authored
Sep 11, 2019
by
Steve Dower
Committed by
Zachary Ware
Sep 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-36634: Fixes activate.bat when existing values contain double quotes (GH-15924)
parent
6357c957
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
25 deletions
+15
-25
Lib/venv/scripts/nt/activate.bat
Lib/venv/scripts/nt/activate.bat
+13
-25
Misc/NEWS.d/next/Windows/2019-09-11-12-34-31.bpo-36634.xLaGgb.rst
...S.d/next/Windows/2019-09-11-12-34-31.bpo-36634.xLaGgb.rst
+2
-0
No files found.
Lib/venv/scripts/nt/activate.bat
View file @
574b324b
...
...
@@ -2,44 +2,32 @@
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
"
set
_OLD_CODEPAGE
=
%%a
)
if
defined
_OLD_CODEPAGE
(
"
%SystemRoot%
\System32\chcp.com"
65001
>
nul
)
set
"VIRTUAL_ENV=__VENV_DIR__"
set
VIRTUAL_ENV
=
__VENV_DIR__
if
not
defined
PROMPT
(
set
"PROMPT=$P$G"
)
if
defined
_OLD_VIRTUAL_PROMPT
(
set
"PROMPT=
%_OLD_VIRTUAL_PROMPT%
"
)
if
not
defined
PROMPT
set
PROMPT
=
$P$G
if
defined
_OLD_VIRTUAL_PYTHONHOME
(
set
"PYTHONHOME=
%_OLD_VIRTUAL_PYTHONHOME%
"
)
if
defined
_OLD_VIRTUAL_PROMPT
set
PROMPT
=
%_OLD_VIRTUAL_PROMPT%
if
defined
_OLD_VIRTUAL_PYTHONHOME
set
PYTHONHOME
=
%_OLD_VIRTUAL_PYTHONHOME%
set
"_OLD_VIRTUAL_PROMPT=
%PROMPT%
"
set
"PROMPT=__VENV_PROMPT__
%PROMPT%
"
set
_OLD_VIRTUAL_PROMPT
=
%PROMPT%
set
PROMPT
=
__VENV_PROMPT__
%PROMPT%
if
defined
PYTHONHOME
(
set
"_OLD_VIRTUAL_PYTHONHOME=
%PYTHONHOME%
"
set
PYTHONHOME
=
)
if
defined
PYTHONHOME
set
_OLD_VIRTUAL_PYTHONHOME
=
%PYTHONHOME%
set
PYTHONHOME
=
if
defined
_OLD_VIRTUAL_PATH
(
set
"PATH=
%_OLD_VIRTUAL_PATH%
"
)
else
(
set
"_OLD_VIRTUAL_PATH=
%PATH%
"
)
if
defined
_OLD_VIRTUAL_PATH
set
PATH
=
%_OLD_VIRTUAL_PATH%
else
set
_OLD_VIRTUAL_PATH
=
%PATH%
set
"PATH=
%VIRTUAL_ENV%
\__VENV_BIN_NAME__;
%PATH%
"
set
PATH
=
%VIRTUAL_ENV%
\__VENV_BIN_NAME__
;
%PATH%
:END
if
defined
_OLD_CODEPAGE
(
"
%SystemRoot%
\System32\chcp.com"
%_OLD_CODEPAGE%
>
nul
set
"_OLD_CODEPAGE="
set
_OLD_CODEPAGE
=
)
Misc/NEWS.d/next/Windows/2019-09-11-12-34-31.bpo-36634.xLaGgb.rst
0 → 100644
View file @
574b324b
venv activate.bat now works when the existing variables contain double quote
characters.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment