- Import hooks functionality from zope.component after it was moved t…

…here from

  zope.site. This lifts the dependency on zope.site.
- Removed an unused ISite import and thereby, the undeclared dependency on
  zope.location.

CHANGES.txt

@@ -5,7 +5,11 @@ CHANGES
 1.3.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Import hooks functionality from zope.component after it was moved there from
+  zope.site. This lifts the dependency on zope.site.
+
+- Removed an unused ISite import and thereby, the undeclared dependency on
+  zope.location.
 
 
 1.3.0 (2009-10-08)

setup.py

@@ -56,7 +56,6 @@ def read(*rnames):
                 'zope.app.zcmlfiles',
                 'zope.pagetemplate',
                 'zope.securitypolicy',
-                'zope.site',
                 'zope.testbrowser',
                 'zope.testing',
                 ]),

src/zc/resourcelibrary/publication.py

@@ -18,14 +18,13 @@
 from zope.app.publication.interfaces import IBrowserRequestFactory
 from zope.browserresource.resource import Resource
 from zope.component import queryMultiAdapter, getMultiAdapter, getSiteManager
-from zope.location.interfaces import ISite
 from zope.publisher.browser import BrowserRequest, BrowserResponse
 from zope.publisher.browser import isHTML
 from zope.publisher.interfaces.browser import IBrowserPublisher
-from zope.site.hooks import getSite
 from zope.traversing.browser.interfaces import IAbsoluteURL
 
 import zc.resourcelibrary
+import zope.component.hooks
 
 
 class Request(BrowserRequest):
@@ -100,7 +99,7 @@ def _implicitResult(self, body):
 
     def _generateIncludes(self, libraries):
         # generate the HTML that will be included in the response
-        site = getSite()
+        site = zope.component.hooks.getSite()
         if site is None:
             return
 

src/zc/resourcelibrary/tests/tests.py

@@ -18,16 +18,15 @@
 from zc.resourcelibrary import publication
 from zc.resourcelibrary import tal
 from zope.app.testing import functional
-from zope.site.hooks import getSite
 from zope.configuration import xmlconfig
-from zope.site.hooks import setSite
 import zope.interface
 from zope.pagetemplate import pagetemplate
 import zope.publisher.interfaces.browser
 from zope.testing import doctest
 import doctest
 import os
 import unittest
+import zope.component.hooks
 import zope.security.management
 
 
@@ -80,8 +79,8 @@ def zpt(s, view=None, content_type=None):
     zope.security.management.newInteraction(request)
 
     # if no set has been set, try setting it the view context
-    if getSite() is None and hasattr(view, 'context'):
-        setSite(view.context)
+    if zope.component.hooks.getSite() is None and hasattr(view, 'context'):
+        zope.component.hooks.setSite(view.context)
 
     pt = TestPageTemplate(view)