``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.

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

2 files changed, 7 insertions, 7 deletions

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 6d61c951..b096a48e 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -368,22 +368,21 @@ class easy_install(Command):
                 )
 
     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 @@ class easy_install(Command):
 
 
 
+
     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)
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index 10786144..0a4cb183 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -3,7 +3,7 @@ from pkg_resources import *
 import pkg_resources, sys
 from sets import ImmutableSet
 
-class Metadata:
+class Metadata(EmptyProvider):
     """Mock object to return metadata as if from an on-disk distribution"""
 
     def __init__(self,*pairs):