[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command develop.py, 1.3, 1.4 easy_install.py, 1.10, 1.11

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16754/setuptools/command

Modified Files:
	develop.py easy_install.py 
Log Message:
Renamings for consistent terminology; distributions and requirements now
both have 'project_name' attributes, instead of one having 'name' and the
other 'distname'.  Requirements no longer have 'options', they have
'extras'.  This is the beginning of the terminology/architecture 
refactoring described at:

http://mail.python.org/pipermail/distutils-sig/2005-June/004652.html



Index: develop.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/develop.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- develop.py	12 Jul 2005 16:09:00 -0000	1.3
+++ develop.py	17 Jul 2005 04:42:41 -0000	1.4
@@ -51,7 +51,7 @@
         self.dist = Distribution(
             self.egg_path,
             PathMetadata(self.egg_path, os.path.abspath(ei.egg_info)),
-            name = ei.egg_name
+            project_name = ei.egg_name
         )
 
     def install_for_development(self):

Index: easy_install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/easy_install.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- easy_install.py	16 Jul 2005 21:57:50 -0000	1.10
+++ easy_install.py	17 Jul 2005 04:42:41 -0000	1.11
@@ -350,7 +350,7 @@
         self.install_egg_scripts(dist)
         log.warn(self.installation_report(dist, *info))
         if requirement is None:
-            requirement = Requirement.parse('%s==%s'%(dist.name,dist.version))
+            requirement = Requirement.parse('%s==%s'%(dist.project_name,dist.version))
         if dist in requirement:
             log.info("Processing dependencies for %s", requirement)
             try:
@@ -419,7 +419,7 @@
             options = match.group(1) or ''
             if options:
                 options = ' '+options
-        spec = '%s==%s' % (dist.name,dist.version)
+        spec = '%s==%s' % (dist.project_name,dist.version)
         executable = os.path.normpath(sys.executable)
 
         if dev_path:
@@ -541,7 +541,7 @@
 
         # Create a dummy distribution object until we build the real distro
         dist = Distribution(None,
-            name=cfg.get('metadata','name'),
+            project_name=cfg.get('metadata','name'),
             version=cfg.get('metadata','version'),
             platform="win32"
         )
@@ -678,7 +678,7 @@
 (Note: you can run EasyInstall on '%s' with the
 --delete-conflicting option to attempt deletion of the above files
 and/or directories.)
-""" % dist.name
+""" % dist.project_name
         else:
             msg += """\
 Note: you can attempt this installation again with EasyInstall, and use
@@ -719,7 +719,7 @@
 PYTHONPATH, or by being added to sys.path by your code.)
 """
         eggloc = dist.path
-        name = dist.name
+        name = dist.project_name
         version = dist.version
         return msg % locals()
 
@@ -802,7 +802,7 @@
 
         self.pth_file.save()
 
-        if dist.name=='setuptools':
+        if dist.project_name=='setuptools':
             # Ensure that setuptools itself never becomes unavailable!
             # XXX should this check for latest version?
             f = open(os.path.join(self.install_dir,'setuptools.pth'), 'w')