diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:07:33 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 14:07:33 +1100 |
| commit | 337ea160558acc352c8a61b9d27c93d1f9e09618 (patch) | |
| tree | 52272a24ccb0b3be0d2349956c5fd44e5e65e565 /setuptools/tests/contexts.py | |
| parent | 3bd5118eaa87b4f6598e0a473fec3623b6579d3b (diff) | |
| parent | d49c41c6ebc16371efabe0b92b417457cf9c47d7 (diff) | |
| download | python-setuptools-git-337ea160558acc352c8a61b9d27c93d1f9e09618.tar.gz | |
Merge from default.
Diffstat (limited to 'setuptools/tests/contexts.py')
| -rw-r--r-- | setuptools/tests/contexts.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py index 1d29284b..8c9a2d3e 100644 --- a/setuptools/tests/contexts.py +++ b/setuptools/tests/contexts.py @@ -5,7 +5,7 @@ import sys import contextlib import site -from ..compat import StringIO +from setuptools.extern import six @contextlib.contextmanager @@ -57,8 +57,8 @@ def quiet(): old_stdout = sys.stdout old_stderr = sys.stderr - new_stdout = sys.stdout = StringIO() - new_stderr = sys.stderr = StringIO() + new_stdout = sys.stdout = six.StringIO() + new_stderr = sys.stderr = six.StringIO() try: yield new_stdout, new_stderr finally: |