churchyard / rpms / python2

Forked from rpms/python2 6 years ago
Clone
4d74b7c
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
75a0703
index 5021ebf..1903cc0 100644
4d74b7c
--- a/Lib/ensurepip/__init__.py
4d74b7c
+++ b/Lib/ensurepip/__init__.py
4d74b7c
@@ -1,9 +1,10 @@
4d74b7c
 #!/usr/bin/env python2
4d74b7c
 from __future__ import print_function
4d74b7c
 
4d74b7c
+import distutils.version
4d74b7c
+import glob
4d74b7c
 import os
4d74b7c
 import os.path
4d74b7c
-import pkgutil
4d74b7c
 import shutil
4d74b7c
 import sys
4d74b7c
 import tempfile
75a0703
@@ -12,9 +13,19 @@ import tempfile
4d74b7c
 __all__ = ["version", "bootstrap"]
4d74b7c
 
4d74b7c
 
c5b3b58
-_SETUPTOOLS_VERSION = "41.2.0"
75a0703
+_WHEEL_DIR = "/usr/share/python-wheels/"
4d74b7c
 
c5b3b58
-_PIP_VERSION = "19.2.3"
4d74b7c
+def _get_most_recent_wheel_version(pkg):
4d74b7c
+    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
4d74b7c
+    suffix = "-py2.py3-none-any.whl"
4d74b7c
+    pattern = "{}*{}".format(prefix, suffix)
4d74b7c
+    versions = (p[len(prefix):-len(suffix)] for p in glob.glob(pattern))
4d74b7c
+    return str(max(versions, key=distutils.version.LooseVersion))
4d74b7c
+
4d74b7c
+
4d74b7c
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
4d74b7c
+
4d74b7c
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
4d74b7c
 
4d74b7c
 _PROJECTS = [
4d74b7c
     ("setuptools", _SETUPTOOLS_VERSION),
4d74b7c
@@ -28,8 +39,13 @@ def _run_pip(args, additional_paths=None):
4d74b7c
         sys.path = additional_paths + sys.path
4d74b7c
 
4d74b7c
     # Install the bundled software
75a0703
-    import pip._internal
75a0703
-    return pip._internal.main(args)
4d74b7c
+    try:
4d74b7c
+        # pip 10
4d74b7c
+        from pip._internal import main
4d74b7c
+    except ImportError:
4d74b7c
+        # pip 9
4d74b7c
+        from pip import main
4d74b7c
+    return main(args)
4d74b7c
 
4d74b7c
 
4d74b7c
 def version():
4d74b7c
@@ -100,12 +116,9 @@ def _bootstrap(root=None, upgrade=False, user=False,
4d74b7c
         additional_paths = []
4d74b7c
         for project, version in _PROJECTS:
4d74b7c
             wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version)
4d74b7c
-            whl = pkgutil.get_data(
4d74b7c
-                "ensurepip",
4d74b7c
-                "_bundled/{}".format(wheel_name),
4d74b7c
-            )
4d74b7c
-            with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
4d74b7c
-                fp.write(whl)
4d74b7c
+            with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:
4d74b7c
+                with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
4d74b7c
+                    fp.write(sfp.read())
4d74b7c
 
4d74b7c
             additional_paths.append(os.path.join(tmpdir, wheel_name))
4d74b7c