Import python3.7 (3.7.5-2)debian/3.7.5-2debian

1 files changed, 25 insertions, 13 deletions

diff --git a/debian/patches/ensurepip-wheels.diff b/debian/patches/ensurepip-wheels.diff
index df5de92..558cf9d 100644
--- a/debian/patches/ensurepip-wheels.diff
+++ b/debian/patches/ensurepip-wheels.diff
@@ -1,5 +1,3 @@
-Index: b/Lib/ensurepip/__init__.py
-===================================================================
 --- a/Lib/ensurepip/__init__.py
 +++ b/Lib/ensurepip/__init__.py
 @@ -1,3 +1,4 @@
@@ -11,9 +9,9 @@ Index: b/Lib/ensurepip/__init__.py
  __all__ = ["version", "bootstrap"]
  
  
--_SETUPTOOLS_VERSION = "28.8.0"
+-_SETUPTOOLS_VERSION = "41.2.0"
 -
--_PIP_VERSION = "9.0.1"
+-_PIP_VERSION = "19.2.3"
 -
  _PROJECTS = [
 -    ("setuptools", _SETUPTOOLS_VERSION),
@@ -24,7 +22,21 @@ Index: b/Lib/ensurepip/__init__.py
  ]
  
  
-@@ -32,7 +30,10 @@ def version():
+@@ -24,15 +22,22 @@ def _run_pip(args, additional_paths=None
+         sys.path = additional_paths + sys.path
+ 
+     # Install the bundled software
+-    import pip._internal
+-    return pip._internal.main(args)
++    try:
++        import pip._internal
++        return pip._internal.main(args)
++    except ImportError:
++        import pip
++        return pip.main(args)
+ 
+ 
+ def version():
      """
      Returns a string specifying the bundled version of pip.
      """
@@ -36,7 +48,7 @@ Index: b/Lib/ensurepip/__init__.py
  
  def _disable_pip_configuration_settings():
      # We deliberately ignore all pip environment variables
-@@ -73,20 +74,44 @@ def bootstrap(*, root=None, upgrade=Fals
+@@ -88,20 +93,44 @@ def _bootstrap(*, root=None, upgrade=Fal
          # omit pip and easy_install
          os.environ["ENSUREPIP_OPTIONS"] = "install"
  
@@ -91,16 +103,16 @@ Index: b/Lib/ensurepip/__init__.py
  
          # Construct the arguments to be passed to the pip command
          args = ["install", "--no-index", "--find-links", tmpdir]
-@@ -99,7 +124,7 @@ def bootstrap(*, root=None, upgrade=Fals
+@@ -114,7 +143,7 @@ def _bootstrap(*, root=None, upgrade=Fal
          if verbosity:
              args += ["-" + "v" * verbosity]
  
--        _run_pip(args + [p[0] for p in _PROJECTS], additional_paths)
-+        _run_pip(args + _PROJECTS, additional_paths)
+-        return _run_pip(args + [p[0] for p in _PROJECTS], additional_paths)
++        return _run_pip(args + _PROJECTS, additional_paths)
  
  def _uninstall_helper(*, verbosity=0):
      """Helper to support a clean default uninstall process on Windows
-@@ -113,7 +138,8 @@ def _uninstall_helper(*, verbosity=0):
+@@ -128,7 +157,8 @@ def _uninstall_helper(*, verbosity=0):
          return
  
      # If the pip version doesn't match the bundled one, leave it alone
@@ -110,12 +122,12 @@ Index: b/Lib/ensurepip/__init__.py
          msg = ("ensurepip will only uninstall a matching version "
                 "({!r} installed, {!r} bundled)")
          print(msg.format(pip.__version__, _PIP_VERSION), file=sys.stderr)
-@@ -126,7 +152,7 @@ def _uninstall_helper(*, verbosity=0):
+@@ -141,7 +171,7 @@ def _uninstall_helper(*, verbosity=0):
      if verbosity:
          args += ["-" + "v" * verbosity]
  
--    _run_pip(args + [p[0] for p in reversed(_PROJECTS)])
-+    _run_pip(args + reversed(_PROJECTS))
+-    return _run_pip(args + [p[0] for p in reversed(_PROJECTS)])
++    return _run_pip(args + reversed(_PROJECTS))
  
  
  def _main(argv=None):