aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2014-05-11 19:13:43 +0200
committerAntoine Pitrou <solipsis@pitrou.net>2014-05-11 19:13:43 +0200
commit5e6b5f2f264ceddbbba86b691641b63154fe3e37 (patch)
tree44aba64434f06f05bbaf3a3e4892d6b943946945
parentFix printing out error message when test fails and run with -bb (diff)
downloadcpython-5e6b5f2f264ceddbbba86b691641b63154fe3e37.tar.gz
cpython-5e6b5f2f264ceddbbba86b691641b63154fe3e37.tar.bz2
cpython-5e6b5f2f264ceddbbba86b691641b63154fe3e37.zip
Try to fix issue #21425 workaround for shared library builds
-rw-r--r--Lib/test/script_helper.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py
index 78c30369755..555934966a6 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)