Merge 3.4 into 3.5

2016-03-17 11:01:04 -04:00 · 2016-03-17 11:01:04 -04:00 · c488bc6a76
parent 5c13aa1562 2bc69c49e1
commit c488bc6a76
3 changed files with 2 additions and 2 deletions
--- a/Lib/ensurepip/init.py
+++ b/Lib/ensurepip/init.py
@ -8,9 +8,9 @@ import tempfile
 __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)
--- 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
--- a/Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl