[Python-checkins] python/nondist/sandbox/setuptools/setuptools init.py, 1.12, 1.13 package_index.py, 1.8, 1.9

Thu Jul 7 18:28:45 CEST 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv755/setuptools
Modified Files:
	__init__.py package_index.py 
Log Message:
Add upload support to setuptools, and make default downloads of setuptools 
come from PyPI/python.org rather than from telecommunity.com. Bump to
version 0.5a7.
Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/__init__.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13

--- __init__.py	7 Jul 2005 02:10:14 -0000	1.12
+++ __init__.py	7 Jul 2005 16:28:43 -0000	1.13
@@ -8,7 +8,7 @@
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.5a6'
+__version__ = '0.5a7'
 
 __all__ = [
 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
Index: package_index.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/package_index.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- package_index.py	27 Jun 2005 00:31:03 -0000	1.8
+++ package_index.py	7 Jul 2005 16:28:43 -0000	1.9
@@ -44,7 +44,9 @@
 
 path = urlparse.urlparse(url)[2]
 base = urllib2.unquote(path.split('/')[-1])
- 
+ if base.endswith('.egg.zip'):
+ base = base[:-4] # strip the .zip
+
 if base.endswith('.egg'):
 dist = Distribution.from_filename(base, metadata)
 dist.path = url
@@ -58,10 +60,10 @@
 )
 
 # Try source distro extensions (.zip, .tgz, etc.)
- # 
+ #
 for ext in EXTENSIONS:
 if base.endswith(ext):
- base = base[:-len(ext)] 
+ base = base[:-len(ext)]
 return interpret_distro_name(url, base, metadata)
 
 return [] # no extension matched
@@ -78,8 +80,6 @@
 
 
 
-
- 
 def interpret_distro_name(url, base, metadata,
 py_version=None, distro_type=SOURCE_DIST, platform=None
 ):
@@ -139,7 +139,7 @@
 dists = list(distros_for_url(url))
 if dists: self.debug("Found link: %s", url)
 
- if dists or not retrieve or url in self.fetched_urls: 
+ if dists or not retrieve or url in self.fetched_urls:
 for dist in dists:
 self.add(dist)
 # don't need the actual page
@@ -164,7 +164,7 @@
 
 def process_index(self,url,page):
 """Process the contents of a PyPI page"""
- 
+
 def scan(link):
 # Process a URL to see if it's for a package page
 if link.startswith(self.index_url):
@@ -226,7 +226,7 @@
 for dist in self.get(requirement.key, ()):
 if dist in requirement:
 return dist
- self.debug("%s does not match %s", requirement, dist) 
+ self.debug("%s does not match %s", requirement, dist)
 return super(PackageIndex, self).obtain(requirement,installer)
 
 
@@ -388,6 +388,9 @@
 else:
 name = "__downloaded__" # default if URL has no path contents
 
+ if name.endswith('.egg.zip'):
+ name = name[:-4] # strip the extra .zip before download
+
 filename = os.path.join(tmpdir,name)
 
 # Download the file
@@ -405,9 +408,6 @@
 self.process_url(url, True)
 
 
-
-
-
 def _download_html(self, url, headers, filename, tmpdir):
 # Check for a sourceforge URL
 sf_url = url.startswith('http://prdownloads.')
@@ -445,7 +445,7 @@
 
 def info(self, msg, *args):
 log.info(msg, *args)
- 
+
 def warn(self, msg, *args):
 log.warn(msg, *args)
 


[Python-checkins] python/nondist/sandbox/setuptools/setuptools __init__.py, 1.12, 1.13 package_index.py, 1.8, 1.9

[Python-checkins] python/nondist/sandbox/setuptools/setuptools init.py, 1.12, 1.13 package_index.py, 1.8, 1.9