[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command easy_install.py, 1.19, 1.20

[pje@users.sourceforge.net]

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

Modified Files:
	easy_install.py 
Log Message:
Renamed AvailableDistributions -> Environment.  Add sketch of pkg_resources
manual outline.


Index: easy_install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/easy_install.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- easy_install.py	6 Aug 2005 17:54:55 -0000	1.19
+++ easy_install.py	7 Aug 2005 01:03:36 -0000	1.20
@@ -181,7 +181,7 @@
             self.package_index = self.create_index(
                 self.index_url, search_path = self.shadow_path
             )
-        self.local_index = AvailableDistributions(self.shadow_path)
+        self.local_index = Environment(self.shadow_path)
 
         if self.find_links is not None:
             if isinstance(self.find_links, basestring):
@@ -805,7 +805,7 @@
         try:
             args.append(dist_dir)
             self.run_setup(setup_script, setup_base, args)
-            all_eggs = AvailableDistributions([dist_dir])
+            all_eggs = Environment([dist_dir])
             eggs = []
             for key in all_eggs:
                 for dist in all_eggs[key]:
@@ -1064,14 +1064,14 @@
 
 
 
-class PthDistributions(AvailableDistributions):
+class PthDistributions(Environment):
     """A .pth file with Distribution paths in it"""
 
     dirty = False
 
     def __init__(self, filename):
         self.filename = filename; self._load()
-        AvailableDistributions.__init__(
+        Environment.__init__(
             self, list(yield_lines(self.paths)), None, None
         )
 
@@ -1109,13 +1109,13 @@
         """Add `dist` to the distribution map"""
         if dist.location not in self.paths:
             self.paths.append(dist.location); self.dirty = True
-        AvailableDistributions.add(self,dist)
+        Environment.add(self,dist)
 
     def remove(self,dist):
         """Remove `dist` from the distribution map"""
         while dist.location in self.paths:
             self.paths.remove(dist.location); self.dirty = True
-        AvailableDistributions.remove(self,dist)
+        Environment.remove(self,dist)
 
 
 def main(argv, **kw):