[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command easy_install.py, 1.11, 1.12

Sun Jul 17 21:01:18 CEST 2005

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30805/setuptools/command
Modified Files:
	easy_install.py 
Log Message:
``Distribution`` objects now implement the ``IResourceProvider`` and
``IMetadataProvider`` interfaces, so you don't need to reference the (no
longer available) ``metadata`` attribute to get at these interfaces.
Index: easy_install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/easy_install.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12

--- easy_install.py	17 Jul 2005 04:42:41 -0000	1.11
+++ easy_install.py	17 Jul 2005 19:01:15 -0000	1.12
@@ -368,22 +368,21 @@
 )
 
 def install_egg_scripts(self, dist):
- metadata = dist.metadata
- if self.exclude_scripts or not metadata.metadata_isdir('scripts'):
+ if self.exclude_scripts or not dist.metadata_isdir('scripts'):
 return
 
- for script_name in metadata.metadata_listdir('scripts'):
+ for script_name in dist.metadata_listdir('scripts'):
 self.install_script(
 dist, script_name,
- metadata.get_metadata('scripts/'+script_name).replace('\r','\n')
+ dist.get_metadata('scripts/'+script_name).replace('\r','\n')
 )
 
 def should_unzip(self, dist):
 if self.zip_ok is not None:
 return not self.zip_ok
- if dist.metadata.has_metadata('not-zip-safe'):
+ if dist.has_metadata('not-zip-safe'):
 return True
- if not dist.metadata.has_metadata('zip-safe'):
+ if not dist.has_metadata('zip-safe'):
 return True
 return False
 
@@ -408,6 +407,7 @@
 
 
 
+
 def install_script(self, dist, script_name, script_text, dev_path=None):
 log.info("Installing %s script to %s", script_name,self.script_dir)
 target = os.path.join(self.script_dir, script_name)
