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

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041132

2 files changed, 7 insertions, 7 deletions

diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py
index a757b2e5..40d22b28 100755
--- a/setuptools/command/develop.py
+++ b/setuptools/command/develop.py
@@ -51,7 +51,7 @@ class develop(easy_install):
         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):
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 4451c586..6d61c951 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -350,7 +350,7 @@ class easy_install(Command):
         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 @@ class easy_install(Command):
             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 @@ class easy_install(Command):
 
         # 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 @@ installing:
 (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 @@ this to work.  (e.g. by being the application's script directory, by being on
 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 @@ PYTHONPATH, or by being added to sys.path by your code.)
 
         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')