diff options
author | PJ Eby <distutils-sig@python.org> | 2006-03-29 05:41:40 +0000 |
---|---|---|
committer | PJ Eby <distutils-sig@python.org> | 2006-03-29 05:41:40 +0000 |
commit | a8ab614c9791958ee84829221fab38c81a01f816 (patch) | |
tree | d93d817ea8ef65294dd85ce233694afa81aa0f9a /setuptools/command/easy_install.py | |
parent | 176f17c6eb0527a4f251a5ef7ea7fc0e37382ce9 (diff) | |
download | external_python_setuptools-a8ab614c9791958ee84829221fab38c81a01f816.tar.gz external_python_setuptools-a8ab614c9791958ee84829221fab38c81a01f816.tar.bz2 external_python_setuptools-a8ab614c9791958ee84829221fab38c81a01f816.zip |
Support complex .pth files in win32.exe->.egg conversion; this addition
lets easy_install handle pywin32... well, almost. You still have to
deal with the "system" DLLs yourself.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4043417
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-x | setuptools/command/easy_install.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 6852ac6e..46958625 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1291,13 +1291,14 @@ def get_exe_prefixes(exe_filename): if name.endswith('-nspkg.pth'): continue if parts[0] in ('PURELIB','PLATLIB'): - pth = z.read(name).strip() - prefixes[0] = ('PURELIB/%s/' % pth), '' - prefixes[1] = ('PLATLIB/%s/' % pth), '' - break + for pth in yield_lines(z.read(name)): + pth = pth.strip().replace('\\','/') + if not pth.startswith('import'): + prefixes.append((('%s/%s/' % (parts[0],pth)), '')) finally: z.close() + prefixes.sort(); prefixes.reverse() return prefixes @@ -1309,7 +1310,6 @@ def parse_requirement_arg(spec): "Not a URL, existing file, or requirement spec: %r" % (spec,) ) - class PthDistributions(Environment): """A .pth file with Distribution paths in it""" |