From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 30 Nov 2013 05:56:58 +0000 (+1000)
Subject: Fix and test pip version consistency
X-Git-Tag: v3.4.0b2~429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b1b1789d022095266c83d4ce441ae6d096afbcd;p=python

Fix and test pip version consistency
---

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 0fdacdad66..1a644da634 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -12,7 +12,7 @@ __all__ = ["version", "bootstrap"]
 
 _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
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index f53eb37dc7..a92f4929da 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -5,6 +5,7 @@ Copyright (C) 2011-2012 Vinay Sajip.
 Licensed to the PSF under a contributor agreement.
 """
 
+import ensurepip
 import os
 import os.path
 import shutil
@@ -313,8 +314,9 @@ class EnsurePipTest(BaseTest):
         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)