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

Thomas Lotze tl at gocept.com
Thu Nov 19 02:05:29 EST 2009


Log message for revision 105850:
  - Import hooks functionality from zope.component after it was moved there from
    zope.site. This lifts the dependency on zope.site and thereby, ZODB.
  - Import ISite and IPossibleSite from zope.component after they were moved
    there from zope.location.
  

Changed:
  U   zope.browserresource/trunk/CHANGES.txt
  U   zope.browserresource/trunk/setup.py
  U   zope.browserresource/trunk/src/zope/browserresource/configure.zcml
  U   zope.browserresource/trunk/src/zope/browserresource/icon.py
  U   zope.browserresource/trunk/src/zope/browserresource/resource.py
  U   zope.browserresource/trunk/src/zope/browserresource/resources.py
  U   zope.browserresource/trunk/src/zope/browserresource/tests/support.py
  U   zope.browserresource/trunk/src/zope/browserresource/tests/test_resource.py

-=-
Modified: zope.browserresource/trunk/CHANGES.txt
===================================================================
--- zope.browserresource/trunk/CHANGES.txt	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/CHANGES.txt	2009-11-19 07:05:29 UTC (rev 105850)
@@ -5,8 +5,12 @@
 3.10.1 (unreleased)
 ===================
 
-- ...
+- Import hooks functionality from zope.component after it was moved there from
+  zope.site. This lifts the dependency on zope.site and thereby, ZODB.
 
+- Import ISite and IPossibleSite from zope.component after they were moved
+  there from zope.location.
+
 3.10.0 (2009-09-25)
 ===================
 

Modified: zope.browserresource/trunk/setup.py
===================================================================
--- zope.browserresource/trunk/setup.py	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/setup.py	2009-11-19 07:05:29 UTC (rev 105850)
@@ -40,7 +40,7 @@
       namespace_packages=['zope'],
       include_package_data=True,
       install_requires=['setuptools',
-                        'zope.component',
+                        'zope.component>=3.8.0',
                         'zope.configuration',
                         'zope.contenttype',
                         'zope.i18n',
@@ -48,7 +48,6 @@
                         'zope.location',
                         'zope.publisher>=3.8',
                         'zope.schema',
-                        'zope.site',
                         'zope.traversing>3.7',
                         ],
       extras_require={

Modified: zope.browserresource/trunk/src/zope/browserresource/configure.zcml
===================================================================
--- zope.browserresource/trunk/src/zope/browserresource/configure.zcml	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/src/zope/browserresource/configure.zcml	2009-11-19 07:05:29 UTC (rev 105850)
@@ -3,7 +3,7 @@
   <adapter factory=".resource.AbsoluteURL" />
   
   <view
-      for="zope.location.interfaces.ISite"
+      for="zope.component.interfaces.ISite"
       type="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
       name=""
       factory=".resources.Resources"

Modified: zope.browserresource/trunk/src/zope/browserresource/icon.py
===================================================================
--- zope.browserresource/trunk/src/zope/browserresource/icon.py	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/src/zope/browserresource/icon.py	2009-11-19 07:05:29 UTC (rev 105850)
@@ -15,10 +15,11 @@
 
 $Id$
 """
+import zope.component.hooks
 from zope.component import getAdapter
 from zope.location import locate
-from zope.site.hooks import getSite
 
+
 class IconView(object):
 
     def __init__(self, context, request, rname, alt, width, height):
@@ -35,7 +36,7 @@
 
     def url(self):
         resource = getAdapter(self.request, name=self.rname)
-        locate(resource, getSite(), self.rname)
+        locate(resource, zope.component.hooks.getSite(), self.rname)
         return resource()
 
 class IconViewFactory(object):

Modified: zope.browserresource/trunk/src/zope/browserresource/resource.py
===================================================================
--- zope.browserresource/trunk/src/zope/browserresource/resource.py	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/src/zope/browserresource/resource.py	2009-11-19 07:05:29 UTC (rev 105850)
@@ -15,11 +15,11 @@
 
 $Id$
 """
+import zope.component.hooks
 from zope.component import adapts, getMultiAdapter, queryMultiAdapter
 from zope.interface import implements, implementsOnly
 from zope.location import Location
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.site.hooks import getSite
 from zope.traversing.browser.interfaces import IAbsoluteURL
 import zope.traversing.browser.absoluteurl
 
@@ -54,7 +54,7 @@
         if name.startswith('++resource++'):
             name = name[12:]
 
-        site = getSite()
+        site = zope.component.hooks.getSite()
         base = queryMultiAdapter((site, self.request), IAbsoluteURL,
             name="resource")
         if base is None:

Modified: zope.browserresource/trunk/src/zope/browserresource/resources.py
===================================================================
--- zope.browserresource/trunk/src/zope/browserresource/resources.py	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/src/zope/browserresource/resources.py	2009-11-19 07:05:29 UTC (rev 105850)
@@ -25,7 +25,7 @@
 class Resources(BrowserView):
     """A view that can be traversed further to access browser resources
     
-    This view is usually registered for zope.location.interfaces.ISite objects
+    This view is usually registered for zope.component.interfaces.ISite objects
     with no name, so resources will be available at <site>/@@/<resource>.
 
     Let's test how it's traversed to get registered resources. Let's create

Modified: zope.browserresource/trunk/src/zope/browserresource/tests/support.py
===================================================================
--- zope.browserresource/trunk/src/zope/browserresource/tests/support.py	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/src/zope/browserresource/tests/support.py	2009-11-19 07:05:29 UTC (rev 105850)
@@ -17,16 +17,16 @@
 """
 
 import zope.component
-import zope.location.interfaces
+import zope.component.hooks
+import zope.component.interfaces
 from zope.interface import implements
 from zope.traversing.interfaces import IContainmentRoot
 
-from zope.site.hooks import setSite
 import zope.browserresource.resource
 
 class Site:
 
-    implements(zope.location.interfaces.ISite, IContainmentRoot)
+    implements(zope.component.interfaces.ISite, IContainmentRoot)
 
     def getSiteManager(self):
         return zope.component.getGlobalSiteManager()
@@ -38,10 +38,10 @@
 
     def setUp(self):
         super(SiteHandler, self).setUp()
-        setSite(site)
+        zope.component.hooks.setSite(site)
         zope.component.provideAdapter(
             zope.browserresource.resource.AbsoluteURL)
 
     def tearDown(self):
-        setSite()
+        zope.component.hooks.setSite()
         super(SiteHandler, self).tearDown()

Modified: zope.browserresource/trunk/src/zope/browserresource/tests/test_resource.py
===================================================================
--- zope.browserresource/trunk/src/zope/browserresource/tests/test_resource.py	2009-11-19 07:04:24 UTC (rev 105849)
+++ zope.browserresource/trunk/src/zope/browserresource/tests/test_resource.py	2009-11-19 07:05:29 UTC (rev 105850)
@@ -21,7 +21,7 @@
 
 from zope.publisher.browser import TestRequest
 
-import zope.location.interfaces
+import zope.component.interfaces
 from zope.browserresource.resource import Resource
 from zope.browserresource.tests import support
 from zope.traversing.browser.interfaces import IAbsoluteURL
@@ -60,7 +60,7 @@
             return 'http://cdn.example.com'
         component.provideAdapter(
             resourceBase,
-            (zope.location.interfaces.ISite, TestRequest),
+            (zope.component.interfaces.ISite, TestRequest),
             IAbsoluteURL, 'resource')
 
         req = TestRequest()



More information about the checkins mailing list