Merged revisions 75842 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75842 | antoine.pitrou | 2009-10-27 20:23:56 +0100 (mar., 27 oct. 2009) | 3 lines Fix transient refleak in test_sys. ........
This commit is contained in:
parent
45ebeb8f24
commit
836f0e217e
|
@ -16,6 +16,7 @@ class SysModuleTest(unittest.TestCase):
|
||||||
sys.stdout = self.orig_stdout
|
sys.stdout = self.orig_stdout
|
||||||
sys.stderr = self.orig_stderr
|
sys.stderr = self.orig_stderr
|
||||||
sys.displayhook = self.orig_displayhook
|
sys.displayhook = self.orig_displayhook
|
||||||
|
test.support.reap_children()
|
||||||
|
|
||||||
def test_original_displayhook(self):
|
def test_original_displayhook(self):
|
||||||
import builtins
|
import builtins
|
||||||
|
@ -261,6 +262,7 @@ class SysModuleTest(unittest.TestCase):
|
||||||
self.current_frames_without_threads()
|
self.current_frames_without_threads()
|
||||||
|
|
||||||
# Test sys._current_frames() in a WITH_THREADS build.
|
# Test sys._current_frames() in a WITH_THREADS build.
|
||||||
|
@test.support.reap_threads
|
||||||
def current_frames_with_threads(self):
|
def current_frames_with_threads(self):
|
||||||
import threading, _thread
|
import threading, _thread
|
||||||
import traceback
|
import traceback
|
||||||
|
@ -424,13 +426,13 @@ class SysModuleTest(unittest.TestCase):
|
||||||
env["PYTHONIOENCODING"] = "cp424"
|
env["PYTHONIOENCODING"] = "cp424"
|
||||||
p = subprocess.Popen([sys.executable, "-c", 'print(chr(0xa2))'],
|
p = subprocess.Popen([sys.executable, "-c", 'print(chr(0xa2))'],
|
||||||
stdout = subprocess.PIPE, env=env)
|
stdout = subprocess.PIPE, env=env)
|
||||||
out = p.stdout.read()
|
out = p.communicate()[0].strip()
|
||||||
self.assertEqual(out, "\xa2\n".encode("cp424"))
|
self.assertEqual(out, "\xa2\n".encode("cp424"))
|
||||||
|
|
||||||
env["PYTHONIOENCODING"] = "ascii:replace"
|
env["PYTHONIOENCODING"] = "ascii:replace"
|
||||||
p = subprocess.Popen([sys.executable, "-c", 'print(chr(0xa2))'],
|
p = subprocess.Popen([sys.executable, "-c", 'print(chr(0xa2))'],
|
||||||
stdout = subprocess.PIPE, env=env)
|
stdout = subprocess.PIPE, env=env)
|
||||||
out = p.stdout.read().strip()
|
out = p.communicate()[0].strip()
|
||||||
self.assertEqual(out, b'?')
|
self.assertEqual(out, b'?')
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue