summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-11-24 10:56:32 -0500
committerJason R. Coombs <jaraco@jaraco.com>2012-11-24 10:56:32 -0500
commit0ac1f691b2ec4cf90953ba1aee176015552eb8b1 (patch)
tree157bbb5780c2f35f48b26e5e20aa195bc42d14b8
parente0ea74d385bd5f2fcbf5030a67a1f51c65b564df (diff)
parent36d2b289f92919582dff786969b41d7c6a6dd92f (diff)
downloadpython-setuptools-git-0ac1f691b2ec4cf90953ba1aee176015552eb8b1.tar.gz
Merged in hollobon/distribute (pull request #29)
--HG-- branch : distribute extra : rebase_source : d3bb70b440414ad17925221b536a10106aece4e4
-rwxr-xr-xsetuptools/command/easy_install.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index f2260236..337532bc 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1522,7 +1522,10 @@ def get_exe_prefixes(exe_filename):
if name.endswith('-nspkg.pth'):
continue
if parts[0].upper() in ('PURELIB','PLATLIB'):
- for pth in yield_lines(z.read(name)):
+ contents = z.read(name)
+ if sys.version_info >= (3,):
+ contents = contents.decode()
+ for pth in yield_lines(contents):
pth = pth.strip().replace('\\','/')
if not pth.startswith('import'):
prefixes.append((('%s/%s/' % (parts[0],pth)), ''))