[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/site/ Convert some uses of ISiteManager to IComponentLookup.

[Philipp von Weitershausen]

Log message for revision 66230:
  Convert some uses of ISiteManager to IComponentLookup.
  Get rid of some deprecated stuff that is to go away for Five 1.5.
  

Changed:
  U   Products.Five/branches/philikon-local-components/site/interfaces.py
  U   Products.Five/branches/philikon-local-components/site/tests/test_localsite.py
  U   Products.Five/branches/philikon-local-components/site/utility.py

-=-
Modified: Products.Five/branches/philikon-local-components/site/interfaces.py
===================================================================
--- Products.Five/branches/philikon-local-components/site/interfaces.py	2006-03-27 10:39:33 UTC (rev 66229)
+++ Products.Five/branches/philikon-local-components/site/interfaces.py	2006-03-27 10:40:29 UTC (rev 66230)
@@ -16,7 +16,7 @@
 $Id: interfaces.py 18584 2005-10-14 17:13:27Z regebro $
 """
 from zope.interface import Interface, Attribute
-from zope.component.interfaces import ISiteManager
+from zope.component.interfaces import IComponentLookup
 
 class IRegisterUtilitySimply(Interface):
     """Register utilities simply
@@ -76,7 +76,7 @@
         returned.
         """
 
-class IFiveSiteManager(ISiteManager, IRegisterUtilitySimply):
+class IFiveSiteManager(IComponentLookup, IRegisterUtilitySimply):
     """Five site manager
 
     For the sake of forward-portability, registering utilities can be
@@ -84,12 +84,3 @@
     utility service (this corresponds to Zope 3.1's understanding of
     site managers).  An implementation of this interface will probably
     delegate the work to an IFiveUtilityService component, though."""
-
-
-# BBB 2005/11/01 -- gone in Five 1.5.
-IFiveUtilityService = IFiveUtilityRegistry
-import zope.deprecation
-zope.deprecation.deprecated(
-    'IFiveUtilityService', "'IFiveUtilityService' has been renamed to "
-    "'IFiveUtilityRegistry' and will disappear in Five 1.5."
-    )

Modified: Products.Five/branches/philikon-local-components/site/tests/test_localsite.py
===================================================================
--- Products.Five/branches/philikon-local-components/site/tests/test_localsite.py	2006-03-27 10:39:33 UTC (rev 66229)
+++ Products.Five/branches/philikon-local-components/site/tests/test_localsite.py	2006-03-27 10:40:29 UTC (rev 66230)
@@ -26,7 +26,7 @@
 import zope.interface
 from zope.component import getGlobalSiteManager, getSiteManager
 from zope.component.interfaces import ComponentLookupError
-from zope.component.interfaces import ISiteManager
+from zope.component.interfaces import IComponentLookup
 from zope.app.component.hooks import setSite, getSite, setHooks
 from zope.app.component.interfaces import IPossibleSite, ISite
 from zope.app.traversing.interfaces import IContainmentRoot
@@ -39,7 +39,7 @@
 from Products.Five import zcml
 
 class SiteManager(Implicit):
-    zope.interface.implements(ISiteManager)
+    zope.interface.implements(IComponentLookup)
 
 class Folder(ObjectManager):
 
@@ -57,7 +57,7 @@
         return getGlobalSiteManager()
 
 class SiteManagerStub(object):
-    zope.interface.implements(ISiteManager)
+    zope.interface.implements(IComponentLookup)
 
 class SiteManagerTest(PlacelessSetup, unittest.TestCase):
 

Modified: Products.Five/branches/philikon-local-components/site/utility.py
===================================================================
--- Products.Five/branches/philikon-local-components/site/utility.py	2006-03-27 10:39:33 UTC (rev 66229)
+++ Products.Five/branches/philikon-local-components/site/utility.py	2006-03-27 10:40:29 UTC (rev 66230)
@@ -116,11 +116,3 @@
                              "%s with the name '%s'" % (interface.getName(),
                                                         name))
         utilities._setObject(id, utility)
-
-# BBB 2005/11/01 -- gone in Five 1.5.
-SimpleLocalUtilityService = SimpleLocalUtilityRegistry
-import zope.deprecation
-zope.deprecation.deprecated(
-    'SimpleLocalUtilityService', "'SimpleLocalUtilityService' has been renamed to "
-    "'SimpleLocalUtilityRegistry' and will disappear in Five 1.5."
-    )