summaryrefslogtreecommitdiffstats
path: root/Lib/test/support
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-06-24 06:29:21 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-06-24 06:29:21 (GMT)
commita67d78e50c02ea3a5605d2e8103342b314bfece7 (patch)
treed32347940043e94b89a086f15993276100137fd6 /Lib/test/support
parent69da9c43431a107f4386d18d18cf08725b3659e6 (diff)
parente495646a9702935ae47f01c4fd06b62328bf11cb (diff)
downloadcpython-a67d78e50c02ea3a5605d2e8103342b314bfece7.zip
cpython-a67d78e50c02ea3a5605d2e8103342b314bfece7.tar.gz
cpython-a67d78e50c02ea3a5605d2e8103342b314bfece7.tar.bz2
Issue #18300: Merge from 3.5
Diffstat (limited to 'Lib/test/support')
-rw-r--r--Lib/test/support/script_helper.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/support/script_helper.py b/Lib/test/support/script_helper.py
index 9c2e9eb..c45d010 100644
--- a/Lib/test/support/script_helper.py
+++ b/Lib/test/support/script_helper.py
@@ -73,6 +73,10 @@ def run_python_until_end(*args, **env_vars):
# Need to preserve the original environment, for in-place testing of
# shared library builds.
env = os.environ.copy()
+ # set TERM='' unless the TERM environment variable is passed explicitly
+ # see issues #11390 and #18300
+ if 'TERM' not in env_vars:
+ env['TERM'] = ''
# But a special flag that can be set to override -- in this case, the
# caller is responsible to pass the full environment.
if env_vars.pop('__cleanenv', None):