[Python-checkins] cpython (merge 3.5 -> default): Upgrade ensurepip bundled setuptools to 20.10.1

[donald.stufft]

https://hg.python.org/cpython/rev/e324588c2959
changeset:   101213:e324588c2959
parent:      101209:c5729c10ce65
parent:      101212:538eeb8c3019
user:        Donald Stufft <donald at stufft.io>
date:        Mon May 02 07:05:29 2016 -0400
summary:
  Upgrade ensurepip bundled setuptools to 20.10.1

files:
  Lib/ensurepip/__init__.py                                      |    2 +-
  Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-20.3-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 = "20.3"
+_SETUPTOOLS_VERSION = "20.10.1"
 
 _PIP_VERSION = "8.1.1"
 
diff --git a/Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9d1319a24aba103fe956ef6298e3649efacc0b93
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
deleted file mode 100644
index 39e67c0b6e3bb3fcb8ed5f42a494f3b1ac3fa9cc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]

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