From: Gregory P. Smith <greg@krypto.org>
Date: Fri, 23 Jan 2015 06:55:00 +0000 (-0800)
Subject: revert 7b833bd1f509.  I misread the side effect that the code was triggering.
X-Git-Tag: v3.4.3rc1~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48e810069ddc725903588c9609ac84900ee65b4c;p=python

revert 7b833bd1f509.  I misread the side effect that the code was triggering.
*any* kwarg supplied to _assert_python causes it to not append -E to the
command line flags so without='-E' does effectively work.
---

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index c862b2078b..327c1455fc 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -426,11 +426,13 @@ class CmdLineTest(unittest.TestCase):
         self.assertIn(b'Unknown option: -z', err)
         self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
         self.assertEqual(b'', out)
-        rc, out, err = assert_python_failure('-z')
+        # Add "without='-E'" to prevent _assert_python to append -E
+        # to env_vars and change the output of stderr
+        rc, out, err = assert_python_failure('-z', without='-E')
         self.assertIn(b'Unknown option: -z', err)
         self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1)
         self.assertEqual(b'', out)
-        rc, out, err = assert_python_failure('-a', '-z')
+        rc, out, err = assert_python_failure('-a', '-z', without='-E')
         self.assertIn(b'Unknown option: -a', err)
         # only the first unknown option is reported
         self.assertNotIn(b'Unknown option: -z', err)