From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 11 May 2014 17:13:43 +0000 (+0200)
Subject: Try to fix issue #21425 workaround for shared library builds
X-Git-Tag: v3.5.0a1~1686^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e6b5f2f264ceddbbba86b691641b63154fe3e37;p=python

Try to fix issue #21425 workaround for shared library builds
---

diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py
index 78c3036975..555934966a 100644
--- a/Lib/test/script_helper.py
+++ b/Lib/test/script_helper.py
@@ -92,8 +92,8 @@ def spawn_python(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kw):
     # - http://reinout.vanrees.org/weblog/2009/08/14/readline-invisible-character-hack.html
     # - http://stackoverflow.com/questions/15760712/python-readline-module-prints-escape-character-during-import
     # - http://lists.gnu.org/archive/html/bug-readline/2007-08/msg00004.html
-    env = kw.setdefault('env', {})
-    env.setdefault('TERM', 'vt100')
+    env = kw.setdefault('env', dict(os.environ))
+    env['TERM'] = 'vt100'
     return subprocess.Popen(cmd_line, stdin=subprocess.PIPE,
                             stdout=stdout, stderr=stderr,
                             **kw)