[Checkins] SVN: zope.app.testing/trunk/ - Import hooks functionality from zope.component after it was moved there from

[Thomas Lotze]

Log message for revision 105881:
  - Import hooks functionality from zope.component after it was moved there from
    zope.site.
  - Import ISite from zope.component after it was moved there from
    zope.location. This lifts the dependency on zope.location.
  

Changed:
  U   zope.app.testing/trunk/CHANGES.txt
  U   zope.app.testing/trunk/setup.py
  U   zope.app.testing/trunk/src/zope/app/testing/functional.py
  U   zope.app.testing/trunk/src/zope/app/testing/setup.py

-=-
Modified: zope.app.testing/trunk/CHANGES.txt
===================================================================
--- zope.app.testing/trunk/CHANGES.txt	2009-11-19 15:37:49 UTC (rev 105880)
+++ zope.app.testing/trunk/CHANGES.txt	2009-11-19 16:31:33 UTC (rev 105881)
@@ -2,11 +2,15 @@
 CHANGES
 =======
 
-3.7.3 (unreleased)
+3.7.4 (unreleased)
 ------------------
 
-- ...
+- Import hooks functionality from zope.component after it was moved there from
+  zope.site.
 
+- Import ISite from zope.component after it was moved there from
+  zope.location. This lifts the dependency on zope.location.
+
 3.7.3 (2009-08-20)
 ------------------
 

Modified: zope.app.testing/trunk/setup.py
===================================================================
--- zope.app.testing/trunk/setup.py	2009-11-19 15:37:49 UTC (rev 105880)
+++ zope.app.testing/trunk/setup.py	2009-11-19 16:31:33 UTC (rev 105881)
@@ -74,7 +74,6 @@
                         'zope.container',
                         'zope.i18n',
                         'zope.interface',
-                        'zope.location',
                         'zope.password',
                         'zope.publisher',
                         'zope.schema',

Modified: zope.app.testing/trunk/src/zope/app/testing/functional.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/functional.py	2009-11-19 15:37:49 UTC (rev 105880)
+++ zope.app.testing/trunk/src/zope/app/testing/functional.py	2009-11-19 16:31:33 UTC (rev 105881)
@@ -49,8 +49,9 @@
 from zope.app.publication.zopepublication import ZopePublication
 from zope.app.publication.http import HTTPPublication
 from zope.app.publication.httpfactory import chooseClasses
-from zope.site.hooks import setSite, getSite
+from zope.component.hooks import setSite, getSite
 
+
 class ResponseWrapper(object):
     """A wrapper that adds several introspective methods to a response."""
 

Modified: zope.app.testing/trunk/src/zope/app/testing/setup.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/setup.py	2009-11-19 15:37:49 UTC (rev 105880)
+++ zope.app.testing/trunk/src/zope/app/testing/setup.py	2009-11-19 16:31:33 UTC (rev 105881)
@@ -55,12 +55,12 @@
 
 #------------------------------------------------------------------------
 # Placeful setup
-import zope.site.hooks
+import zope.component.hooks
 from zope.app.testing.placelesssetup import setUp as placelessSetUp
 from zope.app.testing.placelesssetup import tearDown as placelessTearDown
 def placefulSetUp(site=False):
     placelessSetUp()
-    zope.site.hooks.setHooks()
+    zope.component.hooks.setHooks()
     setUpAnnotations()
     setUpDependable()
     setUpTraversal()
@@ -71,11 +71,10 @@
         createSiteManager(site, setsite=True)
         return site
 
-from zope.site.hooks import setSite
 def placefulTearDown():
     placelessTearDown()
-    zope.site.hooks.resetHooks()
-    setSite()
+    zope.component.hooks.resetHooks()
+    zope.component.hooks.setSite()
 
 #------------------------------------------------------------------------
 # Sample Folder Creation
@@ -123,12 +122,13 @@
 #------------------------------------------------------------------------
 # Sample Folder Creation
 from zope.site.site import LocalSiteManager
-from zope.location.interfaces import ISite
+import zope.component.interfaces
+
 def createSiteManager(folder, setsite=False):
-    if not ISite.providedBy(folder):
+    if not zope.component.interfaces.ISite.providedBy(folder):
         folder.setSiteManager(LocalSiteManager(folder))
     if setsite:
-        setSite(folder)
+        zope.component.hooks.setSite(folder)
     return zope.traversing.api.traverse(folder, "++etc++site")