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

[Thomas Lotze]

Log message for revision 105853:
  - 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.
  

Changed:
  U   zope.app.publication/trunk/CHANGES.txt
  U   zope.app.publication/trunk/src/zope/app/publication/configure.zcml
  U   zope.app.publication/trunk/src/zope/app/publication/site.txt
  U   zope.app.publication/trunk/src/zope/app/publication/zopepublication.py

-=-
Modified: zope.app.publication/trunk/CHANGES.txt
===================================================================
--- zope.app.publication/trunk/CHANGES.txt	2009-11-19 07:25:21 UTC (rev 105852)
+++ zope.app.publication/trunk/CHANGES.txt	2009-11-19 07:34:35 UTC (rev 105853)
@@ -7,7 +7,12 @@
 
 - Removed dependency on zope.i18n.
 
+- 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.
+
 3.9.0 (2009-09-29)
 ------------------
 

Modified: zope.app.publication/trunk/src/zope/app/publication/configure.zcml
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/configure.zcml	2009-11-19 07:25:21 UTC (rev 105852)
+++ zope.app.publication/trunk/src/zope/app/publication/configure.zcml	2009-11-19 07:34:35 UTC (rev 105853)
@@ -13,7 +13,7 @@
 
   <subscriber
       zcml:condition="installed zope.site"
-      for="zope.location.interfaces.ISite
+      for="zope.component.interfaces.ISite
            zope.app.publication.interfaces.IBeforeTraverseEvent"
       handler="zope.site.threadSiteSubscriber"
       />

Modified: zope.app.publication/trunk/src/zope/app/publication/site.txt
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/site.txt	2009-11-19 07:25:21 UTC (rev 105852)
+++ zope.app.publication/trunk/src/zope/app/publication/site.txt	2009-11-19 07:34:35 UTC (rev 105853)
@@ -5,7 +5,7 @@
 This test ensures that the site is correctly set and cleared in a thread
 during traversal using event subscribers. Before we start, no site is set:
 
-  >>> from zope.site import hooks
+  >>> from zope.component import hooks
   >>> hooks.getSite() is None
   True
 

Modified: zope.app.publication/trunk/src/zope/app/publication/zopepublication.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/zopepublication.py	2009-11-19 07:25:21 UTC (rev 105852)
+++ zope.app.publication/trunk/src/zope/app/publication/zopepublication.py	2009-11-19 07:34:35 UTC (rev 105853)
@@ -21,6 +21,7 @@
 import transaction
 
 import zope.component
+import zope.component.interfaces
 from zope.component import queryMultiAdapter
 from zope.event import notify
 from zope.security.interfaces import Unauthorized
@@ -47,8 +48,8 @@
 from zope.authentication.interfaces import IUnauthenticatedPrincipal
 from zope.authentication.interfaces import IFallbackUnauthenticatedPrincipal
 from zope.authentication.interfaces import IAuthentication
-from zope.location.interfaces import ISite
 
+
 class Cleanup(object):
 
     implements(IHeld)
@@ -106,7 +107,7 @@
             # Note that beforeTraversal guarentees that user is not None.
             return
 
-        if not ISite.providedBy(ob):
+        if not zope.component.interfaces.ISite.providedBy(ob):
             # We won't find an authentication utility here, so give up.
             return