Author: Armin Rigo <[email protected]>
Branch:
Changeset: r44636:3c32e2b5a08c
Date: 2011-06-02 10:58 +0200
http://bitbucket.org/pypy/pypy/changeset/3c32e2b5a08c/
Log: Don't rely on __stdout__ or __stderr__. Just save and restore the
previous value instead.
diff --git a/pypy/jit/tl/tinyframe/test/test_tinyframe.py
b/pypy/jit/tl/tinyframe/test/test_tinyframe.py
--- a/pypy/jit/tl/tinyframe/test/test_tinyframe.py
+++ b/pypy/jit/tl/tinyframe/test/test_tinyframe.py
@@ -96,11 +96,12 @@
RETURN r1
''')
s = StringIO()
+ prev = sys.stdout
sys.stdout = s
try:
interpret(code)
finally:
- sys.stdout = sys.__stdout__
+ sys.stdout = prev
lines = s.getvalue().splitlines()
assert lines == [
'0',
diff --git a/pypy/module/cpyext/test/test_sysmodule.py
b/pypy/module/cpyext/test/test_sysmodule.py
--- a/pypy/module/cpyext/test/test_sysmodule.py
+++ b/pypy/module/cpyext/test/test_sysmodule.py
@@ -22,12 +22,13 @@
Py_RETURN_NONE;
""")])
import sys, StringIO
+ prev = sys.stdout
sys.stdout = StringIO.StringIO()
try:
module.writestdout()
assert sys.stdout.getvalue() == "format: 42\n"
finally:
- sys.stdout = sys.__stdout__
+ sys.stdout = prev
class TestSysModule(BaseApiTest):
def test_sysmodule(self, space, api):
diff --git a/pypy/module/pypyjit/test/test_jit_hook.py
b/pypy/module/pypyjit/test/test_jit_hook.py
--- a/pypy/module/pypyjit/test/test_jit_hook.py
+++ b/pypy/module/pypyjit/test/test_jit_hook.py
@@ -76,10 +76,11 @@
pypyjit.set_compile_hook(hook)
s = cStringIO.StringIO()
+ prev = sys.stderr
sys.stderr = s
try:
self.on_compile()
finally:
- sys.stderr = sys.__stderr__
+ sys.stderr = prev
assert 'jit hook' in s.getvalue()
assert 'ZeroDivisionError' in s.getvalue()
diff --git a/pypy/rlib/test/test_jit.py b/pypy/rlib/test/test_jit.py
--- a/pypy/rlib/test/test_jit.py
+++ b/pypy/rlib/test/test_jit.py
@@ -52,9 +52,12 @@
import sys
s = StringIO()
+ prev = sys.stdout
sys.stdout = s
- dis.dis(g)
- sys.stdout = sys.__stdout__
+ try:
+ dis.dis(g)
+ finally:
+ sys.stdout = prev
x = s.getvalue().find('CALL_FUNCTION')
assert x != -1
x = s.getvalue().find('CALL_FUNCTION', x)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
