From a8ab614c9791958ee84829221fab38c81a01f816 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Wed, 29 Mar 2006 05:41:40 +0000 Subject: 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 --- setuptools/command/easy_install.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'setuptools/command/easy_install.py') 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""" -- cgit v1.2.3