[Python-checkins] cpython (merge 3.4 -> 3.5): Merge update to pip

[donald.stufft]

https://hg.python.org/cpython/rev/8dbd3861eb5f
changeset:   100029:8dbd3861eb5f
branch:      3.5
parent:      100025:c89f4f59872f
parent:      100028:c75802aaa4de
user:        Donald Stufft <donald at stufft.io>
date:        Thu Jan 21 21:56:06 2016 -0500
summary:
  Merge update to pip

files:
  Lib/ensurepip/__init__.py                             |    2 +-
  Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl |  Bin 
  3 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 _SETUPTOOLS_VERSION = "19.4"
 
-_PIP_VERSION = "8.0.0"
+_PIP_VERSION = "8.0.2"
 
 # pip currently requires ssl support, so we try to provide a nicer
 # error message when that is missing (http://bugs.python.org/issue19744)
diff --git a/Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl
deleted file mode 100644
index 4e685be865845ae4911efd1e5c04a87b5bd01c99..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cff6237a14ef4f3639c5b505ae7c79580313e286
GIT binary patch
[stripped]

-- 
Repository URL: https://hg.python.org/cpython