diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-13 07:37:46 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-13 07:37:46 -0400 |
| commit | 522dd17075958cf71ed30aada3eaccdb29a9c488 (patch) | |
| tree | adae4b789a1348b0ce526776b83e5613d14643c1 /setuptools/tests/test_resources.py | |
| parent | 8f05565451ef38cc10074582ad826941f8f8c899 (diff) | |
| parent | 430529414dec7264d11400d2c1bd8a207ee76904 (diff) | |
| download | external_python_setuptools-522dd17075958cf71ed30aada3eaccdb29a9c488.tar.gz external_python_setuptools-522dd17075958cf71ed30aada3eaccdb29a9c488.tar.bz2 external_python_setuptools-522dd17075958cf71ed30aada3eaccdb29a9c488.zip | |
Merged latest changes from setuptools-0.6 branch
--HG--
rename : doc/formats.txt => docs/formats.txt
Diffstat (limited to 'setuptools/tests/test_resources.py')
| -rw-r--r-- | setuptools/tests/test_resources.py | 4 |
1 files changed, 2 insertions, 2 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 |