diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 15:01:44 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 15:01:44 -0500 |
| commit | b0abfb1c076baced9bf182a357dd47e9482bf065 (patch) | |
| tree | 55a30c8bdd916583a818895c0b660f73815202d0 /tests/test_ez_setup.py | |
| parent | c04abca662dcbffd00d928e06fbf32b9f49f8e57 (diff) | |
| parent | 3c86c861ab9665df0e502f250a7471d09240e413 (diff) | |
| download | python-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 'tests/test_ez_setup.py')
| -rw-r--r-- | tests/test_ez_setup.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py index 922bd884..26881f52 100644 --- a/tests/test_ez_setup.py +++ b/tests/test_ez_setup.py @@ -16,7 +16,7 @@ import ez_setup class TestSetup(unittest.TestCase): def urlopen(self, url): - return open(self.tarball) + return open(self.tarball, 'rb') def setUp(self): self.old_sys_path = copy.copy(sys.path) @@ -27,7 +27,7 @@ class TestSetup(unittest.TestCase): "--dist-dir", "%s" % self.tmpdir) tarball = os.listdir(self.tmpdir)[0] self.tarball = os.path.join(self.tmpdir, tarball) - import urllib2 + from setuptools.compat import urllib2 urllib2.urlopen = self.urlopen def tearDown(self): @@ -37,7 +37,7 @@ class TestSetup(unittest.TestCase): def test_build_egg(self): # making it an egg - egg = _build_egg(self.tarball, self.tmpdir) + egg = _build_egg('Egg to be built', self.tarball, self.tmpdir) # now trying to import it sys.path[0] = egg |