mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge 3.5

Browse source
This commit is contained in:
Victor Stinner 2017-01-12 11:53:09 +01:00
commit 12c4aba1a0
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/test/support/script_helper.py
View file

@ -70,17 +70,28 @@ def run_python_until_end(*args, **env_vars):
elif not env_vars and not env_required: elif not env_vars and not env_required:
# ignore Python environment variables # ignore Python environment variables
cmd_line.append('-E') cmd_line.append('-E')
# 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 # But a special flag that can be set to override -- in this case, the
# caller is responsible to pass the full environment. # caller is responsible to pass the full environment.
if env_vars.pop('__cleanenv', None): if env_vars.pop('__cleanenv', None):
env = {} env = {}
if sys.platform == 'win32':
# Windows requires at least the SYSTEMROOT environment variable to
# start Python.
env['SYSTEMROOT'] = os.environ['SYSTEMROOT']
# Other interesting environment variables, not copied currently:
# COMSPEC, HOME, PATH, TEMP, TMPDIR, TMP.
else:
# 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'] = ''
env.update(env_vars) env.update(env_vars)
cmd_line.extend(args) cmd_line.extend(args)
proc = subprocess.Popen(cmd_line, stdin=subprocess.PIPE, proc = subprocess.Popen(cmd_line, stdin=subprocess.PIPE,

2
Lib/test/test_imaplib.py
View file

@ -477,7 +477,7 @@ class NewIMAPTests(NewIMAPTestsMixin, unittest.TestCase):
@unittest.skipUnless(ssl, "SSL not available") @unittest.skipUnless(ssl, "SSL not available")
class NewIMAPSSLTests(NewIMAPTestsMixin, unittest.TestCase): class NewIMAPSSLTests(NewIMAPTestsMixin, unittest.TestCase):
imap_class = imaplib.IMAP4_SSL imap_class = IMAP4_SSL
server_class = SecureTCPServer server_class = SecureTCPServer
def test_ssl_raises(self): def test_ssl_raises(self):