[Python-checkins] python/nondist/sandbox/setuptools pkg_resources.py, 1.47, 1.48 setuptools.txt, 1.19, 1.20

Mon Jul 18 04:28:16 CEST 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13936
Modified Files:
	pkg_resources.py setuptools.txt 
Log Message:
Catch a few missed terminology changes.
Index: pkg_resources.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/pkg_resources.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48

--- pkg_resources.py	18 Jul 2005 02:06:15 -0000	1.47
+++ pkg_resources.py	18 Jul 2005 02:28:14 -0000	1.48
@@ -362,7 +362,7 @@
 # Oops, the "best" so far conflicts with a dependency
 raise VersionConflict(dist,req) # XXX put more info here
 
- requirements.extend(dist.depends(req.extras)[::-1])
+ requirements.extend(dist.requires(req.extras)[::-1])
 processed[req] = True
 
 return to_activate # return list of distros to activate
@@ -1569,8 +1569,8 @@
 
 _dep_map = property(_dep_map)
 
- def depends(self,extras=()):
- """List of Requirements needed for this distro if `options` are used"""
+ def requires(self,extras=()):
+ """List of Requirements needed for this distro if `extras` are used"""
 dm = self._dep_map
 deps = []
 deps.extend(dm.get(None,()))
@@ -1686,16 +1686,18 @@
 raise ValueError("Missing distribution spec", line)
 project_name = match.group(1)
 p = match.end()
- options = []
+ extras = []
 
 match = OBRACKET(line,p)
 if match:
 p = match.end()
- line, p, options = scan_list(DISTRO,CBRACKET,line,p,(1,),"option")
+ line, p, extras = scan_list(
+ DISTRO, CBRACKET, line, p, (1,), "'extra' name"
+ )
 
 line, p, specs = scan_list(VERSION,LINE_END,line,p,(1,2),"version spec")
 specs = [(op,val.replace('_','-')) for op,val in specs]
- yield Requirement(project_name.replace('_','-'), specs, options)
+ yield Requirement(project_name.replace('_','-'), specs, extras)
 
 
 def _sort_dists(dists):
@@ -1718,8 +1720,6 @@
 
 
 
-
-
 class Requirement:
 def __init__(self, project_name, specs=(), extras=()):
 self.project_name = project_name
Index: setuptools.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- setuptools.txt	18 Jul 2005 01:39:45 -0000	1.19
+++ setuptools.txt	18 Jul 2005 02:28:14 -0000	1.20
@@ -1419,7 +1419,7 @@
 
 * Distribution objects no longer have an ``installed_on()`` method, and the
 ``install_on()`` method is now ``activate()`` (but may go away altogether
- soon).
+ soon). The ``depends()`` method has also been renamed to ``requires()``.
 
 * ``find_distributions()`` now takes an additional argument called ``only``,
 that tells it to only yield distributions whose location is the passed-in
