Issue #25093: Merge with 3.4

This commit is contained in:
Zachary Ware 2015-10-12 23:30:15 -05:00
commit fa10f61ee5

View file

@ -1,5 +1,6 @@
import unittest import unittest
import re import re
import subprocess
import sys import sys
import os import os
from test import support from test import support
@ -242,11 +243,10 @@ class TclTest(unittest.TestCase):
with support.EnvironmentVarGuard() as env: with support.EnvironmentVarGuard() as env:
env.unset("TCL_LIBRARY") env.unset("TCL_LIBRARY")
f = os.popen('%s -c "import tkinter; print(tkinter)"' % (unc_name,)) stdout = subprocess.check_output(
[unc_name, '-c', 'import tkinter; print(tkinter)'])
self.assertIn('tkinter', f.read()) self.assertIn(b'tkinter', stdout)
# exit code must be zero
self.assertEqual(f.close(), None)
def test_exprstring(self): def test_exprstring(self):
tcl = self.interp tcl = self.interp