[Python-checkins] r45555 - sandbox/trunk/setuptools/setuptools/package_index.py

[phillip.eby]

Author: phillip.eby
Date: Wed Apr 19 02:18:58 2006
New Revision: 45555

Modified:
   sandbox/trunk/setuptools/setuptools/package_index.py
Log:
Support file:// links to directories in --find-links, so that 
easy_install can build packages from local source checkouts.


Modified: sandbox/trunk/setuptools/setuptools/package_index.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/package_index.py	(original)
+++ sandbox/trunk/setuptools/setuptools/package_index.py	Wed Apr 19 02:18:58 2006
@@ -179,7 +179,7 @@
     def process_filename(self, fn, nested=False):
         # process filenames or directories
         if not os.path.exists(fn):
-            self.warn("Not found: %s", url)
+            self.warn("Not found: %s", fn)
             return
 
         if os.path.isdir(fn) and not nested:
@@ -450,7 +450,7 @@
 
 
     def gen_setup(self, filename, fragment, tmpdir):
-        match = EGG_FRAGMENT.match(fragment); #import pdb; pdb.set_trace()
+        match = EGG_FRAGMENT.match(fragment)
         dists = match and [d for d in
             interpret_distro_name(filename, match.group(1), None) if d.version
         ] or []
@@ -582,7 +582,6 @@
 
 
     def _download_url(self, scheme, url, tmpdir):
-
         # Determine download filename
         #
         name = filter(None,urlparse.urlparse(url)[2].split('/'))
@@ -602,6 +601,8 @@
         #
         if scheme=='svn' or scheme.startswith('svn+'):
             return self._download_svn(url, filename)
+        elif scheme=='file':
+            return urllib2.url2pathname(urlparse.urlparse(url)[2])
         else:
             headers = self.retry_sf_download(url, filename)
             if 'html' in headers['content-type'].lower():
@@ -612,7 +613,6 @@
     def scan_url(self, url):
         self.process_url(url, True)
 
-
     def _download_html(self, url, headers, filename, tmpdir):
         file = open(filename)
         for line in file:
@@ -672,3 +672,26 @@
             # DNS-bl0ck1n9 f1r3w4llz sUx0rs!
             _sf_mirrors[:] = ['dl.sourceforge.net']
     return random.choice(_sf_mirrors)
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# this line is a kludge to keep the trailing blank lines for pje's editor