Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-04-20 02:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-96894: Do not turn echo off for subsequent commands in batch activators (GH-96895)

Browse source
This commit is contained in:
Paweł Szramowski 2026-04-13 13:50:46 +02:00 • committed by GitHub
parent 0274d8304e
commit d24ce178a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Lib/venv/scripts/nt/activate.bat
View file

@ -1,34 +1,32 @@
@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 "tokens=2 delims=:." %%a in ('"%SystemRoot%\System32\chcp.com"') do @(
@set _OLD_CODEPAGE=%%a
)
if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" 65001 > nul
@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 not defined PROMPT @set PROMPT=$P$G
if defined _OLD_VIRTUAL_PROMPT set PROMPT=%_OLD_VIRTUAL_PROMPT%
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%
if not defined _OLD_VIRTUAL_PATH set _OLD_VIRTUAL_PATH=%PATH%
@if defined _OLD_VIRTUAL_PATH @set PATH=%_OLD_VIRTUAL_PATH%
@if not defined _OLD_VIRTUAL_PATH @set _OLD_VIRTUAL_PATH=%PATH%
set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
set "VIRTUAL_ENV_PROMPT=__VENV_PROMPT__"
@set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
@set "VIRTUAL_ENV_PROMPT=__VENV_PROMPT__"
:END
if defined _OLD_CODEPAGE (
"%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
set _OLD_CODEPAGE=
@if defined _OLD_CODEPAGE (
@"%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul
@set _OLD_CODEPAGE=
)

24
Lib/venv/scripts/nt/deactivate.bat
View file

@ -1,22 +1,20 @@
@echo off
if defined _OLD_VIRTUAL_PROMPT (
set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
@if defined _OLD_VIRTUAL_PROMPT (
@set "PROMPT=%_OLD_VIRTUAL_PROMPT%"
)
set _OLD_VIRTUAL_PROMPT=
@set _OLD_VIRTUAL_PROMPT=
if defined _OLD_VIRTUAL_PYTHONHOME (
set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
set _OLD_VIRTUAL_PYTHONHOME=
@if defined _OLD_VIRTUAL_PYTHONHOME (
@set "PYTHONHOME=%_OLD_VIRTUAL_PYTHONHOME%"
@set _OLD_VIRTUAL_PYTHONHOME=
)
if defined _OLD_VIRTUAL_PATH (
set "PATH=%_OLD_VIRTUAL_PATH%"
@if defined _OLD_VIRTUAL_PATH (
@set "PATH=%_OLD_VIRTUAL_PATH%"
)
set _OLD_VIRTUAL_PATH=
@set _OLD_VIRTUAL_PATH=
set VIRTUAL_ENV=
set VIRTUAL_ENV_PROMPT=
@set VIRTUAL_ENV=
@set VIRTUAL_ENV_PROMPT=
:END

1
Misc/ACKS
View file

@ -1891,6 +1891,7 @@ John Szakmeister
Piotr Szczepaniak
Amir Szekely
David Szotten
Paweł Szramowski
Maciej Szulik
Joel Taddei
Arfrever Frehtes Taifersar Arahesis

2
Misc/NEWS.d/next/Library/2022-09-17-20-20-01.gh-issue-96894.t7my0A.rst Normal file
View file

@ -0,0 +1,2 @@
Do not turn echo off for subsequent commands in batch activators
(``activate.bat`` and ``deactivate.bat``) of :mod:`venv`.