summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2014-03-02 18:29:19 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2014-03-02 18:29:19 (GMT)
commit582538bde2c212ddc40a58764a1bd4eeb54255ab (patch)
tree41b2dc45c2411980e1e2b874793018e8e56d4414
parent75512c4556da5a8215a99c57e9a056f191ad9c99 (diff)
downloadcpython-582538bde2c212ddc40a58764a1bd4eeb54255ab.zip
cpython-582538bde2c212ddc40a58764a1bd4eeb54255ab.tar.gz
cpython-582538bde2c212ddc40a58764a1bd4eeb54255ab.tar.bz2
Issue #20748: Uninstalling pip does not leave behind the pyc of
the uninstaller anymore.
-rw-r--r--Misc/NEWS3
-rw-r--r--Tools/msi/msi.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 172bb73..054341d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
Build
-----
+- Issue #20748: Uninstalling pip does not leave behind the pyc of
+ the uninstaller anymore.
+
- Issue #20568: The Windows installer now installs the unversioned ``pip``
command in addition to the versioned ``pip3`` and ``pip3.4`` commands.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index f2b7148..2ba72e4 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -421,7 +421,7 @@ def add_ui(db):
compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_|lib2to3\\tests|venv\\scripts" "[TARGETDIR]Lib"'
lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"'
updatepipargs = r'-m ensurepip -U --default-pip'
- removepipargs = r'-m ensurepip._uninstall'
+ removepipargs = r'-B -m ensurepip._uninstall'
# See "CustomAction Table"
add_data(db, "CustomAction", [
# msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty