[Checkins] SVN: five.localsitemanager/trunk/ Adjusted code to use the new zope.site and zope.container packages and use the ISite interface from zope.location.
Hanno Schlichting
plone at hannosch.info
Wed Feb 4 06:30:25 EST 2009
Log message for revision 96072:
Adjusted code to use the new zope.site and zope.container packages and use the ISite interface from zope.location.
Changed:
U five.localsitemanager/trunk/CHANGES.txt
U five.localsitemanager/trunk/buildout.cfg
U five.localsitemanager/trunk/setup.py
U five.localsitemanager/trunk/src/five/localsitemanager/__init__.py
U five.localsitemanager/trunk/src/five/localsitemanager/browser.py
U five.localsitemanager/trunk/src/five/localsitemanager/browser.txt
U five.localsitemanager/trunk/src/five/localsitemanager/configure.zcml
U five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt
U five.localsitemanager/trunk/src/five/localsitemanager/registry.py
U five.localsitemanager/trunk/src/five/localsitemanager/tests.py
-=-
Modified: five.localsitemanager/trunk/CHANGES.txt
===================================================================
--- five.localsitemanager/trunk/CHANGES.txt 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/CHANGES.txt 2009-02-04 11:30:25 UTC (rev 96072)
@@ -4,6 +4,10 @@
2.0 - Unreleased
----------------
+* Adjusted code to use the new zope.site and zope.container packages and use
+ the ISite interface from zope.location.
+ [hannosch]
+
* Specify all package dependencies including Acquisition and Zope2. You need
to use either the eggified Zope 2.12 or create fake-eggs for these.
[hannosch]
Modified: five.localsitemanager/trunk/buildout.cfg
===================================================================
--- five.localsitemanager/trunk/buildout.cfg 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/buildout.cfg 2009-02-04 11:30:25 UTC (rev 96072)
@@ -6,7 +6,10 @@
recipe = plone.recipe.zope2install
url = http://www.zope.org/Products/Zope/2.11.2/Zope-2.11.2-final.tgz
fake-zope-eggs = true
-skip-fake-eggs = zope.component
+skip-fake-eggs =
+ zope.component
+ zope.location
+ zope.schema
additional-fake-eggs =
Acquisition
Zope2
Modified: five.localsitemanager/trunk/setup.py
===================================================================
--- five.localsitemanager/trunk/setup.py 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/setup.py 2009-02-04 11:30:25 UTC (rev 96072)
@@ -2,7 +2,7 @@
$Id$
"""
-from setuptools import setup, Extension
+from setuptools import setup
version = '2.0dev'
@@ -35,10 +35,12 @@
install_requires=[
'setuptools',
'zope.component >= 3.5.0',
+ 'zope.container',
'zope.event',
'zope.interface',
+ 'zope.location >= 3.5.0',
+ 'zope.site >= 3.6.0',
'zope.traversing',
- 'zope.app.component',
'Acquisition',
'Zope2',
'ZODB3',
Modified: five.localsitemanager/trunk/src/five/localsitemanager/__init__.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/__init__.py 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/src/five/localsitemanager/__init__.py 2009-02-04 11:30:25 UTC (rev 96072)
@@ -18,7 +18,7 @@
from Acquisition import aq_base
from zope.component.globalregistry import base
from zope.traversing.interfaces import IContainmentRoot
-from zope.app.component.interfaces import ISite
+from zope.location.interfaces import ISite
from five.localsitemanager.registry import PersistentComponents
from five.localsitemanager.utils import get_parent
from Products.Five.component.interfaces import IObjectManagerSite
@@ -48,7 +48,7 @@
"""
make_site(obj, IObjectManagerSite)
-# Zope 3 version: zope.app.component.site._findNextSiteManager
+# Zope 3 version: zope.site.site._findNextSiteManager
def find_next_sitemanager(site):
"""Find the closest sitemanager that is not the specified site's
sitemanager.
@@ -79,7 +79,7 @@
sm = site.getSiteManager()
sm.__bases__ = (next, )
-# Zope 3 version: zope.app.component.site.changeSiteConfigurationAfterMove
+# Zope 3 version: zope.site.site.changeSiteConfigurationAfterMove
def update_sitemanager_bases_handler(site, event):
"""After a site is moved, its site manager links have to be updated."""
if event.newParent is not None:
Modified: five.localsitemanager/trunk/src/five/localsitemanager/browser.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/browser.py 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/src/five/localsitemanager/browser.py 2009-02-04 11:30:25 UTC (rev 96072)
@@ -15,7 +15,7 @@
$Id$
"""
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
from zope.component.globalregistry import base
from five.localsitemanager import make_objectmanager_site
Modified: five.localsitemanager/trunk/src/five/localsitemanager/browser.txt
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/browser.txt 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/src/five/localsitemanager/browser.txt 2009-02-04 11:30:25 UTC (rev 96072)
@@ -21,7 +21,7 @@
Enable local component lookup hooks:
- >>> from zope.app.component.hooks import setHooks
+ >>> from zope.site.hooks import setHooks
>>> setHooks()
User Set Up
Modified: five.localsitemanager/trunk/src/five/localsitemanager/configure.zcml
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/configure.zcml 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/src/five/localsitemanager/configure.zcml 2009-02-04 11:30:25 UTC (rev 96072)
@@ -4,7 +4,7 @@
<subscriber
for="Products.Five.component.interfaces.IObjectManagerSite
- zope.app.container.interfaces.IObjectMovedEvent"
+ zope.container.interfaces.IObjectMovedEvent"
handler=".update_sitemanager_bases_handler"
/>
Modified: five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/src/five/localsitemanager/localsitemanager.txt 2009-02-04 11:30:25 UTC (rev 96072)
@@ -10,10 +10,9 @@
Of course we now need to transform that IPossibleSite into a real ISite.
>>> import zope.component
- >>> from zope.app.component.hooks import setSite as setActiveSite
- >>> from zope.app.component.hooks import clearSite
+ >>> from zope.site.hooks import setSite
- >>> from zope.app.component.hooks import setHooks
+ >>> from zope.site.hooks import setHooks
>>> setHooks()
>>> from five.localsitemanager import make_objectmanager_site
@@ -53,11 +52,11 @@
Make sure the utility lookup only works when the correct active site has
been configured.
- >>> setActiveSite(None)
+ >>> setSite()
>>> zope.component.queryUtility(ITestUtility, name=u'hello_world') is None
True
- >>> setActiveSite(site)
+ >>> setSite(site)
>>> zope.component.queryUtility(ITestUtility, name=u'hello_world')
<Utility TestUtility "test">
@@ -104,11 +103,11 @@
Make sure the adapter lookup only works when the correct active site has
been configured.
- >>> setActiveSite(None)
+ >>> setSite()
>>> zope.component.queryAdapter(Foo('foo'), ITestAdapter) is None
True
- >>> setActiveSite(site)
+ >>> setSite(site)
>>> zope.component.queryAdapter(Foo('foo'), ITestAdapter)
<Adapter TestAdapter adapting "foo">
>>> ITestAdapter(Foo('foo'))
@@ -248,7 +247,7 @@
exception otherwise:
>>> make_objectmanager_site(self.app.a)
- >>> setActiveSite(self.app.a)
+ >>> setSite(self.app.a)
>>> sitemanager_a = self.app.a.getSiteManager()
>>> sitemanager_a.registerUtility(self.app.a.b.util,
... name=u'with_aq_chain',
@@ -454,7 +453,7 @@
Lookup both utilities in the context of the first site manager:
- >>> setActiveSite(folder1)
+ >>> setSite(folder1)
>>> util1 = queryUtility(ITestUtility, name=u'util1')
>>> util1
<Utility AQTestUtility "util1">
@@ -469,7 +468,7 @@
Lookup both utilities in the context of the second site manager:
- >>> setActiveSite(folder1_1)
+ >>> setSite(folder1_1)
>>> util1 = queryUtility(ITestUtility, name=u'util1')
>>> util1
<Utility AQTestUtility "util1">
@@ -523,7 +522,7 @@
Lookup both utilities in the context of the global site manager:
- >>> clearSite()
+ >>> setSite()
>>> globalutil1 = queryUtility(ITestUtility, name=u'globalutil1')
>>> globalutil1
<Utility AQTestUtility "globalutil1">
@@ -538,7 +537,7 @@
Lookup both utilities in the context of the local site manager:
- >>> setActiveSite(folder1)
+ >>> setSite(folder1)
>>> globalutil1 = queryUtility(ITestUtility, name=u'globalutil1')
>>> globalutil1
<Utility AQTestUtility "globalutil1">
@@ -562,5 +561,5 @@
--------
>>> from zope.testing.cleanup import cleanUp
- >>> clearSite()
+ >>> setSite()
>>> cleanUp()
Modified: five.localsitemanager/trunk/src/five/localsitemanager/registry.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/registry.py 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/src/five/localsitemanager/registry.py 2009-02-04 11:30:25 UTC (rev 96072)
@@ -19,8 +19,7 @@
import persistent
import OFS.ObjectManager
from Acquisition.interfaces import IAcquirer
-from zope.app.component.hooks import getSite
-from zope.app.component.interfaces import ISite
+from zope.location.interfaces import ISite
from zope.component.persistentregistry import PersistentAdapterRegistry
from zope.component.persistentregistry import PersistentComponents
from zope.component.registry import UtilityRegistration, _getUtilityProvided
@@ -28,6 +27,7 @@
from zope.interface.adapter import _lookup
from zope.interface.adapter import _lookupAll
from zope.interface.adapter import _subscriptions
+from zope.site.hooks import getSite
import zope.event
import zope.component.interfaces
from ZPublisher.BaseRequest import RequestContainer
Modified: five.localsitemanager/trunk/src/five/localsitemanager/tests.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/tests.py 2009-02-04 11:08:34 UTC (rev 96071)
+++ five.localsitemanager/trunk/src/five/localsitemanager/tests.py 2009-02-04 11:30:25 UTC (rev 96072)
@@ -3,13 +3,6 @@
from Testing.ZopeTestCase import FunctionalDocFileSuite
def test_suite():
- if __name__ not in ('five.localsitemanager',
- 'five.localsitemanager.tests',
- '__main__'):
- # a safety net for when five.localsitemanager is manged into sys.path
- # of a zope2 product
- return unittest.TestSuite()
-
return unittest.TestSuite([
ZopeDocFileSuite('localsitemanager.txt',
package="five.localsitemanager"),
More information about the Checkins
mailing list