[Checkins] SVN: zope.site/trunk/src/zope/site/ import hooks from zope.component now

[Thomas Lotze]

Log message for revision 105797:
  import hooks from zope.component now

Changed:
  U   zope.site/trunk/src/zope/site/site.py
  U   zope.site/trunk/src/zope/site/site.txt
  U   zope.site/trunk/src/zope/site/testing.py

-=-
Modified: zope.site/trunk/src/zope/site/site.py
===================================================================
--- zope.site/trunk/src/zope/site/site.py	2009-11-18 09:06:48 UTC (rev 105796)
+++ zope.site/trunk/src/zope/site/site.py	2009-11-18 09:08:42 UTC (rev 105797)
@@ -29,6 +29,7 @@
 import zope.interface
 import zope.component
 import zope.component.persistentregistry
+import zope.component.hooks
 import zope.component.interfaces
 import zope.location
 import zope.location.interfaces
@@ -41,9 +42,11 @@
 from zope.container.contained import Contained
 
 from zope.site import interfaces
-from zope.site.hooks import setSite
 
+# BBB
+from zope.component.hooks import setSite
 
+
 class SiteManagementFolder(BTreeContainer):
     zope.interface.implements(interfaces.ISiteManagementFolder)
 
@@ -178,7 +181,7 @@
 
     Sets the 'site' thread global if the object traversed is a site.
     """
-    setSite(ob)
+    zope.component.hooks.setSite(ob)
 
 
 def clearThreadSiteSubscriber(event):
@@ -189,7 +192,7 @@
     clearSite()
 
 # Clear the site thread global
-clearSite = setSite
+clearSite = zope.component.hooks.setSite
 try:
     from zope.testing.cleanup import addCleanUp
 except ImportError:

Modified: zope.site/trunk/src/zope/site/site.txt
===================================================================
--- zope.site/trunk/src/zope/site/site.txt	2009-11-18 09:06:48 UTC (rev 105796)
+++ zope.site/trunk/src/zope/site/site.txt	2009-11-18 09:08:42 UTC (rev 105797)
@@ -188,7 +188,7 @@
 
 By the way, once you set a site
 
-  >>> from zope.site import hooks
+  >>> from zope.component import hooks
   >>> hooks.setSite(myfolder)
 
 you can simply use the zope.component's `getSiteManager()` method to get

Modified: zope.site/trunk/src/zope/site/testing.py
===================================================================
--- zope.site/trunk/src/zope/site/testing.py	2009-11-18 09:06:48 UTC (rev 105796)
+++ zope.site/trunk/src/zope/site/testing.py	2009-11-18 09:08:42 UTC (rev 105797)
@@ -16,8 +16,8 @@
 import os.path
 import zope.app.testing.functional
 import zope.component
+import zope.component.hooks
 import zope.container.interfaces
-import zope.site.hooks
 import zope.site.site
 from zope.app.testing.placelesssetup import setUp as placelessSetUp
 from zope.app.testing.placelesssetup import tearDown as placelessTearDown
@@ -26,13 +26,13 @@
 from zope.location.interfaces import ISite
 from zope.site import LocalSiteManager, SiteManagerAdapter, SiteManagerContainer
 from zope.site.folder import rootFolder
-from zope.site.hooks import setSite
 
+
 def createSiteManager(folder, setsite=False):
     if not ISite.providedBy(folder):
         folder.setSiteManager(LocalSiteManager(folder))
     if setsite:
-        setSite(folder)
+        zope.component.hooks.setSite(folder)
     return folder.getSiteManager()
 
 def addUtility(sitemanager, name, iface, utility, suffix=''):
@@ -49,7 +49,7 @@
 
 def siteSetUp(site=False):
     placelessSetUp()
-    zope.site.hooks.setHooks()
+    zope.component.hooks.setHooks()
 
     zope.component.provideAdapter(
         SiteManagerAdapter, (Interface,), IComponentLookup)
@@ -61,8 +61,8 @@
 
 def siteTearDown():
     placelessTearDown()
-    zope.site.hooks.resetHooks()
-    zope.site.hooks.setSite()
+    zope.component.hooks.resetHooks()
+    zope.component.hooks.setSite()
 
 
 layer = zope.app.testing.functional.ZCMLLayer(