[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 into default

[donald.stufft]

https://hg.python.org/cpython/rev/89704c124fa8
changeset:   100575:89704c124fa8
parent:      100572:507eee5d3fee
parent:      100574:f874520fd6d8
user:        Donald Stufft <donald at stufft.io>
date:        Thu Mar 17 11:01:35 2016 -0400
summary:
  Merge 3.5 into default

files:
  Lib/ensurepip/__init__.py                                   |    4 ++--
  Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl       |  Bin 
  Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl       |  Bin 
  Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl |  Bin 
  5 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "19.4"
+_SETUPTOOLS_VERSION = "20.3"
 
-_PIP_VERSION = "8.0.2"
+_PIP_VERSION = "8.1.1"
 
 # 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.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl
deleted file mode 100644
index cff6237a14ef4f3639c5b505ae7c79580313e286..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8632eb7af04c6337f0442a878ecb99cd2b1a67e0
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl
deleted file mode 100644
index b58455f31ed6d10d450e22ae9fa57023891f758f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..39e67c0b6e3bb3fcb8ed5f42a494f3b1ac3fa9cc
GIT binary patch
[stripped]

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