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

Fri Sep 9 12:15:16 EDT 2016

https://hg.python.org/cpython/rev/ff942f8a8f49
changeset: 103405:ff942f8a8f49
branch: 3.5
parent: 103398:d1ff6a039ab3
parent: 103404:c853260f6223
user: Donald Stufft <donald at stufft.io>
date: Fri Sep 09 12:14:43 2016 -0400
summary:
 Merge 3.4
files:
 Lib/ensurepip/__init__.py | 2 +-
 Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl | Bin 
 Lib/ensurepip/_bundled/setuptools-27.1.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
@@ -8,7 +8,7 @@
 __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.1-py2.py3-none-any.whl
deleted file mode 100644
index 8e4ddc4f1ad0a77ec09744858abee256263a2664..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..de213bb72715caa07d12e94f97033110c1767e8d
GIT binary patch
[stripped]
-- 
Repository URL: https://hg.python.org/cpython
