diff options
Diffstat (limited to 'setuptools/tests')
| -rw-r--r-- | setuptools/tests/test_resources.py | 4 | ||||
| -rw-r--r-- | setuptools/tests/win_script_wrapper.txt | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 9c2ed9c9..34e341b5 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -527,7 +527,7 @@ class ScriptHeaderTests(TestCase): platform = sys.platform sys.platform = 'java1.5.0_13' - stdout = sys.stdout + stdout, stderr = sys.stdout, sys.stderr try: # A mock sys.executable that uses a shebang line (this file) exe = os.path.normpath(os.path.splitext(__file__)[0] + '.py') @@ -550,7 +550,7 @@ class ScriptHeaderTests(TestCase): finally: del sys.modules["java"] sys.platform = platform - sys.stdout = stdout + sys.stdout, sys.stderr = stdout, stderr diff --git a/setuptools/tests/win_script_wrapper.txt b/setuptools/tests/win_script_wrapper.txt index 9f7c81d6..9ccc96f0 100644 --- a/setuptools/tests/win_script_wrapper.txt +++ b/setuptools/tests/win_script_wrapper.txt @@ -38,7 +38,7 @@ We'll also copy cli.exe to the sample-directory with the name foo.exe: >>> import pkg_resources >>> f = open(os.path.join(sample_directory, 'foo.exe'), 'wb') >>> f.write( - ... pkg_resources.resource_string('setuptools', 'cli.exe') + ... pkg_resources.resource_string('setuptools', 'cli-32.exe') ... ) >>> f.close() @@ -83,7 +83,7 @@ enter the interpreter after running the script, you could use -Oi: >>> f = open(os.path.join(sample_directory, 'foo-script.py'), 'w') >>> f.write( - ... """#!%(python_exe)s -Oi + ... """#!%(python_exe)s -Oi ... import sys ... input = repr(sys.stdin.read()) ... print sys.argv[0][-14:] @@ -126,7 +126,7 @@ We'll also copy gui.exe to the sample-directory with the name bar.exe: >>> import pkg_resources >>> f = open(os.path.join(sample_directory, 'bar.exe'), 'wb') >>> f.write( - ... pkg_resources.resource_string('setuptools', 'gui.exe') + ... pkg_resources.resource_string('setuptools', 'gui-32.exe') ... ) >>> f.close() |