[pypy-commit] pypy py3.5: Backed out changeset 83e15a9ac426

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.5
Changeset: r89469:b4a03f3d70b6
Date: 2017-01-10 12:07 +0100
http://bitbucket.org/pypy/pypy/changeset/b4a03f3d70b6/

Log:	Backed out changeset 83e15a9ac426

	It seems that --version was never actually changed to print to
	stderr (it prints to stdout in 3.3, 3.4 and 3.5)

diff --git a/lib-python/3/test/test_ensurepip.py b/lib-python/3/test/test_ensurepip.py
--- a/lib-python/3/test/test_ensurepip.py
+++ b/lib-python/3/test/test_ensurepip.py
@@ -310,7 +310,7 @@
 
     @requires_usable_pip
     def test_bootstrap_version(self):
-        with test.support.captured_stderr() as stdout:
+        with test.support.captured_stdout() as stdout:
             with self.assertRaises(SystemExit):
                 ensurepip._main(["--version"])
         result = stdout.getvalue().strip()
@@ -335,7 +335,7 @@
 class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
 
     def test_uninstall_version(self):
-        with test.support.captured_stderr() as stdout:
+        with test.support.captured_stdout() as stdout:
             with self.assertRaises(SystemExit):
                 ensurepip._uninstall._main(["--version"])
         result = stdout.getvalue().strip()