diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 21:00:47 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 21:00:47 -0500 |
| commit | d9184f7b8f0b9405f68ea45dbd574aad6a08666d (patch) | |
| tree | e93b4d6ca527f8b22c4a11b978864f61ebe02405 /setuptools/tests/contexts.py | |
| parent | 6bdbe8957d8c8d293e3fea3fa4baf45eb7c3a3a4 (diff) | |
| parent | b639cf0fa905f6fda3879c991197b759aaa20091 (diff) | |
| download | external_python_setuptools-d9184f7b8f0b9405f68ea45dbd574aad6a08666d.tar.gz external_python_setuptools-d9184f7b8f0b9405f68ea45dbd574aad6a08666d.tar.bz2 external_python_setuptools-d9184f7b8f0b9405f68ea45dbd574aad6a08666d.zip | |
Merge feature/issue-22919.3b1
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: |