summaryrefslogtreecommitdiff
path: root/setuptools/tests/test_bdist_egg.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-18 15:01:44 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-06-18 15:01:44 -0500
commitb0abfb1c076baced9bf182a357dd47e9482bf065 (patch)
tree55a30c8bdd916583a818895c0b660f73815202d0 /setuptools/tests/test_bdist_egg.py
parentc04abca662dcbffd00d928e06fbf32b9f49f8e57 (diff)
parent3c86c861ab9665df0e502f250a7471d09240e413 (diff)
downloadpython-setuptools-git-b0abfb1c076baced9bf182a357dd47e9482bf065.tar.gz
Merge Python 3 native support from distribute
--HG-- rename : tests/test_distribute_setup.py => tests/test_ez_setup.py
Diffstat (limited to 'setuptools/tests/test_bdist_egg.py')
-rw-r--r--setuptools/tests/test_bdist_egg.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 7da122cc..1a122186 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -4,9 +4,9 @@ import sys
import os, re, shutil, tempfile, unittest
import tempfile
import site
-from StringIO import StringIO
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