Address Paul's review

Author: erlend-aasland

Doc/library/ensurepip.rst

@@ -106,18 +106,16 @@ Module API
    Returns a string specifying the available version of pip that will be
    installed when bootstrapping an environment.
 
-.. function:: bootstrap(root=None, prefix=None, upgrade=False, user=False, \
+.. function:: bootstrap(root=None, upgrade=False, user=False, \
                         altinstall=False, default_pip=False, \
-                        verbosity=0)
+                        verbosity=0, prefix=None)
 
    Bootstraps ``pip`` into the current or designated environment.
 
    *root* specifies an alternative root directory to install relative to.
    If *root* is ``None``, then installation uses the default install location
    for the current environment.
 
-   *prefix* specifies the directory prefix to use when installing.
-
    *upgrade* indicates whether or not to upgrade an existing installation
    of an earlier version of ``pip`` to the available version.
 
@@ -138,9 +136,11 @@ Module API
    *verbosity* controls the level of output to :data:`sys.stdout` from the
    bootstrapping operation.
 
+   *prefix* specifies the directory prefix to use when installing.
+
    .. versionchanged:: 3.13
 
-      The *prefix* parameter was added.
+      The *prefix* parameter.
 
    .. audit-event:: ensurepip.bootstrap root ensurepip.bootstrap
 

Lib/ensurepip/__init__.py

@@ -106,30 +106,32 @@ def _disable_pip_configuration_settings():
     os.environ['PIP_CONFIG_FILE'] = os.devnull
 
 
-def bootstrap(*, root=None, prefix=None, upgrade=False, user=False,
+def bootstrap(*, root=None, upgrade=False, user=False,
               altinstall=False, default_pip=False,
-              verbosity=0):
+              verbosity=0, prefix=None):
     """
     Bootstrap pip into the current Python installation (or the given root
     and directory prefix).
 
     Note that calling this function will alter both sys.path and os.environ.
     """
     # Discard the return value
-    _bootstrap(root=root, prefix=prefix, upgrade=upgrade, user=user,
+    _bootstrap(root=root, upgrade=upgrade, user=user,
                altinstall=altinstall, default_pip=default_pip,
-               verbosity=verbosity)
+               verbosity=verbosity, prefix=prefix)
 
 
-def _bootstrap(*, root=None, prefix=None, upgrade=False, user=False,
+def _bootstrap(*, root=None, upgrade=False, user=False,
               altinstall=False, default_pip=False,
-              verbosity=0):
+              verbosity=0, prefix=None):
     """
     Bootstrap pip into the current Python installation (or the given root
     and directory prefix). Returns pip command status code.
 
     Note that calling this function will alter both sys.path and os.environ.
     """
+    if root is not None and prefix is not None:
+        raise ValueError("Cannot use 'root' and 'prefix' together")
     if altinstall and default_pip:
         raise ValueError("Cannot use altinstall and default_pip together")
 

Lib/test/test_ensurepip.py

@@ -110,6 +110,11 @@ def test_bootstrapping_with_prefix(self):
             unittest.mock.ANY,
         )
 
+    def test_root_and_prefix_mutual_exclusive(self):
+        with self.assertRaises(ValueError):
+            ensurepip.bootstrap(root="", prefix="")
+        self.assertFalse(self.run_pip.called)
+
     def test_bootstrapping_with_user(self):
         ensurepip.bootstrap(user=True)
 

Makefile.pre.in

@@ -2336,7 +2336,7 @@ install: @FRAMEWORKINSTALLFIRST@ @INSTALLTARGETS@ @FRAMEWORKINSTALLLAST@
 			install|*) ensurepip="" ;; \
 		esac; \
 		$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
-			$$ensurepip --root=$(DESTDIR)/ --prefix=$(prefix) ; \
+			$$ensurepip --prefix=$(prefix) ; \
 	fi
 
 .PHONY: altinstall
@@ -2347,7 +2347,7 @@ altinstall: commoninstall
 			install|*) ensurepip="--altinstall" ;; \
 		esac; \
 		$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
-			$$ensurepip --root=$(DESTDIR)/ --prefix=$(prefix) ; \
+			$$ensurepip --prefix=$(prefix) ; \
 	fi
 
 .PHONY: commoninstall