[Checkins] SVN: zope.app.component/trunk/ Fix imports of ISite/IPossibleSite
Dan Korostelev
nadako at gmail.com
Tue Dec 16 02:43:40 EST 2008
Log message for revision 94095:
Fix imports of ISite/IPossibleSite
Changed:
U zope.app.component/trunk/CHANGES.txt
U zope.app.component/trunk/src/zope/app/component/browser/__init__.py
U zope.app.component/trunk/src/zope/app/component/browser/configure.zcml
U zope.app.component/trunk/src/zope/app/component/configure.zcml
U zope.app.component/trunk/src/zope/app/component/site.py
U zope.app.component/trunk/src/zope/app/component/site.txt
U zope.app.component/trunk/src/zope/app/component/tests/test_site.py
-=-
Modified: zope.app.component/trunk/CHANGES.txt
===================================================================
--- zope.app.component/trunk/CHANGES.txt 2008-12-16 07:37:15 UTC (rev 94094)
+++ zope.app.component/trunk/CHANGES.txt 2008-12-16 07:43:39 UTC (rev 94095)
@@ -25,7 +25,8 @@
- Deprecate ISite and IPossibleSite imports from
zope.app.component.interfaces. They were moved
- to zope.location.interfaces ages ago.
+ to zope.location.interfaces ages ago. Fix imports
+ in zope.app.component itself.
3.5.0 (2008-10-13)
------------------
Modified: zope.app.component/trunk/src/zope/app/component/browser/__init__.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/browser/__init__.py 2008-12-16 07:37:15 UTC (rev 94094)
+++ zope.app.component/trunk/src/zope/app/component/browser/__init__.py 2008-12-16 07:43:39 UTC (rev 94095)
@@ -23,11 +23,11 @@
from zope.publisher.browser import BrowserView
from zope.component.interfaces import IFactory
from zope.component.interface import searchInterface
+from zope.location.interfaces import ISite
from zope.app.component.i18n import ZopeMessageFactory as _
from zope.app.container.browser.adding import Adding
from zope.app.component.site import LocalSiteManager
-from zope.app.component.interfaces import ISite
class ComponentAdding(Adding):
"""Adding subclass used for registerable components."""
Modified: zope.app.component/trunk/src/zope/app/component/browser/configure.zcml
===================================================================
--- zope.app.component/trunk/src/zope/app/component/browser/configure.zcml 2008-12-16 07:37:15 UTC (rev 94094)
+++ zope.app.component/trunk/src/zope/app/component/browser/configure.zcml 2008-12-16 07:43:39 UTC (rev 94095)
@@ -68,7 +68,7 @@
<!-- Site Manager navigation action -->
<browser:page
- for="zope.app.component.interfaces.IPossibleSite"
+ for="zope.location.interfaces.IPossibleSite"
name="addSiteManager.html"
permission="zope.ManageSite"
class=".MakeSite"
@@ -77,17 +77,17 @@
<browser:menuItem
menu="zmi_actions" title="Make a site"
- for="zope.app.component.interfaces.IPossibleSite"
+ for="zope.location.interfaces.IPossibleSite"
action="@@addSiteManager.html"
filter="python:
- not modules['zope.app.component.interfaces'].ISite.providedBy(context)"
+ not modules['zope.location.interfaces'].ISite.providedBy(context)"
permission="zope.ManageSite"
/>
<browser:menuItem
menu="zmi_actions"
title="Manage Site"
- for="zope.app.component.interfaces.ISite"
+ for="zope.location.interfaces.ISite"
action="++etc++site/@@SelectedManagementView.html"
permission="zope.ManageSite"
/>
Modified: zope.app.component/trunk/src/zope/app/component/configure.zcml
===================================================================
--- zope.app.component/trunk/src/zope/app/component/configure.zcml 2008-12-16 07:37:15 UTC (rev 94094)
+++ zope.app.component/trunk/src/zope/app/component/configure.zcml 2008-12-16 07:43:39 UTC (rev 94095)
@@ -51,7 +51,7 @@
<adapter factory=".site.SiteManagerAdapter" />
<subscriber
- for=".interfaces.ISite
+ for="zope.location.interfaces.ISite
zope.app.publication.interfaces.IBeforeTraverseEvent"
handler=".site.threadSiteSubscriber"
/>
@@ -62,7 +62,7 @@
/>
<subscriber
- for=".interfaces.ISite
+ for="zope.location.interfaces.ISite
zope.app.container.interfaces.IObjectMovedEvent"
handler=".site.changeSiteConfigurationAfterMove"
/>
Modified: zope.app.component/trunk/src/zope/app/component/site.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/site.py 2008-12-16 07:37:15 UTC (rev 94094)
+++ zope.app.component/trunk/src/zope/app/component/site.py 2008-12-16 07:43:39 UTC (rev 94095)
@@ -87,7 +87,7 @@
This is a mix-in that implements the IPossibleSite
interface; for example, it is used by the Folder implementation.
"""
- zope.interface.implements(interfaces.IPossibleSite)
+ zope.interface.implements(zope.location.interfaces.IPossibleSite)
_sm = None
@@ -98,7 +98,7 @@
raise ComponentLookupError('no site manager defined')
def setSiteManager(self, sm):
- if interfaces.ISite.providedBy(self):
+ if zope.location.interfaces.ISite.providedBy(self):
raise TypeError("Already a site")
if zope.component.interfaces.IComponentLookup.providedBy(sm):
@@ -109,7 +109,7 @@
raise ValueError('setSiteManager requires an IComponentLookup')
zope.interface.directlyProvides(
- self, interfaces.ISite,
+ self, zope.location.interfaces.ISite,
zope.interface.directlyProvidedBy(self))
zope.event.notify(interfaces.NewLocalSite(sm))
@@ -126,7 +126,7 @@
# there was not enough context; probably run from a test
return None
- if interfaces.ISite.providedBy(site):
+ if zope.location.interfaces.ISite.providedBy(site):
return site.getSiteManager()
@@ -242,7 +242,7 @@
"""
current = ob
while True:
- if interfaces.ISite.providedBy(current):
+ if zope.location.interfaces.ISite.providedBy(current):
return current.getSiteManager()
current = getattr(current, '__parent__', None)
if current is None:
Modified: zope.app.component/trunk/src/zope/app/component/site.txt
===================================================================
--- zope.app.component/trunk/src/zope/app/component/site.txt 2008-12-16 07:37:15 UTC (rev 94094)
+++ zope.app.component/trunk/src/zope/app/component/site.txt 2008-12-16 07:43:39 UTC (rev 94095)
@@ -19,13 +19,13 @@
has the potential to become a site
- >>> from zope.app.component import interfaces
- >>> interfaces.IPossibleSite.providedBy(myfolder)
+ >>> from zope.location.interfaces import ISite, IPossibleSite
+ >>> IPossibleSite.providedBy(myfolder)
True
but is not yet one:
- >>> interfaces.ISite.providedBy(myfolder)
+ >>> ISite.providedBy(myfolder)
False
If you would like your custom content component to be able to become a site,
@@ -36,16 +36,16 @@
... pass
>>> myContent = MyContentComponent()
- >>> interfaces.IPossibleSite.providedBy(myContent)
+ >>> IPossibleSite.providedBy(myContent)
True
- >>> interfaces.ISite.providedBy(myContent)
+ >>> ISite.providedBy(myContent)
False
To convert a possible site to a real site, we have to provide a site manager:
>>> sm = site.LocalSiteManager(myfolder)
>>> myfolder.setSiteManager(sm)
- >>> interfaces.ISite.providedBy(myfolder)
+ >>> ISite.providedBy(myfolder)
True
>>> myfolder.getSiteManager() is sm
True
@@ -287,7 +287,7 @@
>>> from zope.app import container
>>> gsm.registerHandler(
... site.changeSiteConfigurationAfterMove,
- ... (interfaces.ISite, container.interfaces.IObjectMovedEvent),
+ ... (ISite, container.interfaces.IObjectMovedEvent),
... )
We only have to register one event listener, since the copy action causes an
Modified: zope.app.component/trunk/src/zope/app/component/tests/test_site.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/tests/test_site.py 2008-12-16 07:37:15 UTC (rev 94094)
+++ zope.app.component/trunk/src/zope/app/component/tests/test_site.py 2008-12-16 07:43:39 UTC (rev 94095)
@@ -21,6 +21,7 @@
import zope.interface
import zope.interface.verify
from zope.testing import doctest
+from zope.location.interfaces import ISite, IPossibleSite
from zope.app.testing import setup
from zope.app.component import interfaces, site
@@ -128,17 +129,17 @@
container that has no site manager."""
def test_IPossibleSite_verify(self):
- zope.interface.verify.verifyObject(interfaces.IPossibleSite,
+ zope.interface.verify.verifyObject(IPossibleSite,
self.makeTestObject())
def test_get_and_set(self):
smc = self.makeTestObject()
- self.failIf(interfaces.ISite.providedBy(smc))
+ self.failIf(ISite.providedBy(smc))
sm = site.LocalSiteManager(smc)
smc.setSiteManager(sm)
- self.failUnless(interfaces.ISite.providedBy(smc))
+ self.failUnless(ISite.providedBy(smc))
self.failUnless(smc.getSiteManager() is sm)
- zope.interface.verify.verifyObject(interfaces.ISite, smc)
+ zope.interface.verify.verifyObject(ISite, smc)
def test_set_w_bogus_value(self):
smc=self.makeTestObject()
More information about the Checkins
mailing list