From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 2 Mar 2014 18:29:19 +0000 (+0100)
Subject:  Issue #20748: Uninstalling pip does not leave behind the pyc of
X-Git-Tag: v3.4.1rc1~233^2~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e6faf7fed5a297633401e77445323cd313b4f4f;p=thirdparty%2FPython%2Fcpython.git

 Issue #20748: Uninstalling pip does not leave behind the pyc of
 the uninstaller anymore.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 3af41ea0d670..f63cbf78d310 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,9 @@ Tests
 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 f2b71482c2b2..2ba72e4f7299 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