Fix and test pip version consistency
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 0fdacda..1a644da 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -12,7 +12,7 @@
_SETUPTOOLS_VERSION = "1.3.2"
-_PIP_VERSION = "1.5.rc1"
+_PIP_VERSION = "1.5rc1"
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
diff --git a/Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl
similarity index 100%
rename from Lib/ensurepip/_bundled/pip-1.5.rc1-py2.py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-1.5rc1-py2.py3-none-any.whl
Binary files differ
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index f53eb37..a92f492 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -5,6 +5,7 @@
Licensed to the PSF under a contributor agreement.
"""
+import ensurepip
import os
import os.path
import shutil
@@ -313,8 +314,9 @@
err = err.decode("latin-1") # Force to text, prevent decoding errors
self.assertEqual(err, "")
out = out.decode("latin-1") # Force to text, prevent decoding errors
+ expected_version = "pip {}".format(ensurepip.version())
+ self.assertEqual(out[:len(expected_version)], expected_version)
env_dir = os.fsencode(self.env_dir).decode("latin-1")
- self.assertTrue(out.startswith("pip"))
self.assertIn(env_dir, out)