diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-10-10 09:39:21 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-10-10 09:39:21 +0100 |
| commit | ac3ba239c54965e464e6047fd872f02ca1c0cb99 (patch) | |
| tree | 34caf2b39ab801fe2cd7d6ce5280c75fe6f47ec5 /setuptools/tests/test_test.py | |
| parent | fb8c7cf0abc9ce58b8a6f0621c0a9909fb9b8eff (diff) | |
| download | external_python_setuptools-ac3ba239c54965e464e6047fd872f02ca1c0cb99.tar.gz external_python_setuptools-ac3ba239c54965e464e6047fd872f02ca1c0cb99.tar.bz2 external_python_setuptools-ac3ba239c54965e464e6047fd872f02ca1c0cb99.zip | |
Post-merge fixes for Python 3.
--HG--
branch : distribute
extra : source : 6b9041dea7b9197f6ea1fb993d7a05dd4f7c580d
Diffstat (limited to 'setuptools/tests/test_test.py')
| -rw-r--r-- | setuptools/tests/test_test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py index ad7cbd0f..e7022995 100644 --- a/setuptools/tests/test_test.py +++ b/setuptools/tests/test_test.py @@ -6,9 +6,9 @@ import sys import os, shutil, tempfile, unittest import tempfile import site -from StringIO import StringIO from distutils.errors import DistutilsError +from setuptools.compat import StringIO from setuptools.command.test import test from setuptools.command import easy_install as easy_install_pkg from setuptools.dist import Distribution @@ -121,4 +121,4 @@ class TestTestTest(unittest.TestCase): pass finally: sys.stdout = old_stdout -
\ No newline at end of file + |