summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2016-09-09 16:15:07 (GMT)
committerDonald Stufft <donald@stufft.io>2016-09-09 16:15:07 (GMT)
commit783c9ef84dad5fc136a271ccd7fc30d2e556a58e (patch)
treee36bbdf03dcb732a6dd169b0ea1eb580ed3607ff
parentf5307381794183d6e54f744761fe3af281900de9 (diff)
parent6bde454f9e8bb9139f3e9042c527b9ff15373246 (diff)
downloadcpython-783c9ef84dad5fc136a271ccd7fc30d2e556a58e.zip
cpython-783c9ef84dad5fc136a271ccd7fc30d2e556a58e.tar.gz
cpython-783c9ef84dad5fc136a271ccd7fc30d2e556a58e.tar.bz2
Merge 3.5
-rw-r--r--Lib/ensurepip/__init__.py2
-rw-r--r--Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl)bin464970 -> 464973 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 37e34ed..fee1004d 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@ import tempfile
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "27.1.1"
+_SETUPTOOLS_VERSION = "27.1.2"
_PIP_VERSION = "8.1.2"
diff --git a/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl
index 8e4ddc4..de213bb 100644
--- a/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl
Binary files differ