summaryrefslogtreecommitdiff
path: root/setuptools/tests/test_bdist_egg.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-07-05 15:06:51 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-07-05 15:06:51 -0400
commitb49435397a5094f94678adf3549cc8941aa469b7 (patch)
treeb123bdd63482393ba1e2859364920f40a3d9f71d /setuptools/tests/test_bdist_egg.py
parent5b865b1b6e23379d23aa80e74adb38db8b14b6ca (diff)
downloadpython-setuptools-git-b49435397a5094f94678adf3549cc8941aa469b7.tar.gz
Use six for Python 2 compatibility
--HG-- branch : feature/issue-229 extra : source : 7b1997ececc5772798ce33a0f8e77387cb55a977
Diffstat (limited to 'setuptools/tests/test_bdist_egg.py')
-rw-r--r--setuptools/tests/test_bdist_egg.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index cf4bcd11..937e0ed0 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -8,8 +8,9 @@ import sys
import tempfile
import unittest
+import six
+
from distutils.errors import DistutilsError
-from setuptools.compat import StringIO
from setuptools.command.bdist_egg import bdist_egg
from setuptools.command import easy_install as easy_install_pkg
from setuptools.dist import Distribution
@@ -56,7 +57,7 @@ class TestDevelopTest(unittest.TestCase):
))
os.makedirs(os.path.join('build', 'src'))
old_stdout = sys.stdout
- sys.stdout = o = StringIO()
+ sys.stdout = o = six.StringIO()
try:
dist.parse_command_line()
dist.run_commands()
@@ -69,4 +70,3 @@ class TestDevelopTest(unittest.TestCase):
def test_suite():
return unittest.makeSuite(TestDevelopTest)
-