[Checkins] SVN: zope.site/trunk/s import ISite and IPossibleSite from zope.component after they were moved there from zope.location
Thomas Lotze
tl at gocept.com
Wed Nov 18 04:34:13 EST 2009
Log message for revision 105805:
import ISite and IPossibleSite from zope.component after they were moved there from zope.location
Changed:
U zope.site/trunk/setup.py
U zope.site/trunk/src/zope/site/configure.zcml
U zope.site/trunk/src/zope/site/folder.py
U zope.site/trunk/src/zope/site/interfaces.py
U zope.site/trunk/src/zope/site/site.py
U zope.site/trunk/src/zope/site/site.txt
U zope.site/trunk/src/zope/site/testing.py
U zope.site/trunk/src/zope/site/tests/test_site.py
-=-
Modified: zope.site/trunk/setup.py
===================================================================
--- zope.site/trunk/setup.py 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/setup.py 2009-11-18 09:34:13 UTC (rev 105805)
@@ -64,7 +64,7 @@
'zope.annotation',
'zope.container',
'zope.security',
- 'zope.component>=3.8.0dev',
+ 'zope.component>=3.8.0',
'zope.event',
'zope.interface',
'zope.lifecycleevent',
Modified: zope.site/trunk/src/zope/site/configure.zcml
===================================================================
--- zope.site/trunk/src/zope/site/configure.zcml 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/src/zope/site/configure.zcml 2009-11-18 09:34:13 UTC (rev 105805)
@@ -52,7 +52,7 @@
<adapter factory=".site.SiteManagerAdapter" />
<subscriber
- for="zope.location.interfaces.ISite
+ for="zope.component.interfaces.ISite
zope.container.interfaces.IObjectMovedEvent"
handler=".site.changeSiteConfigurationAfterMove"
/>
Modified: zope.site/trunk/src/zope/site/folder.py
===================================================================
--- zope.site/trunk/src/zope/site/folder.py 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/src/zope/site/folder.py 2009-11-18 09:34:13 UTC (rev 105805)
@@ -20,8 +20,8 @@
from zope.site.interfaces import IFolder, IRootFolder
from zope.site.site import SiteManagerContainer
-from zope.location.interfaces import ISite
+import zope.component.interfaces
import zope.container.folder
@@ -59,7 +59,7 @@
>>> from zope.component.interfaces import IComponentLookup
>>> directlyProvides(sm, IComponentLookup)
>>> folder.setSiteManager(sm)
- >>> directlyProvides(folder, ISite)
+ >>> directlyProvides(folder, zope.component.interfaces.ISite)
>>> subs = list(FolderSublocations(folder).sublocations())
>>> subs.remove(folder['ob1'])
>>> subs.remove(folder['ob2'])
@@ -77,5 +77,5 @@
for key in folder:
yield folder[key]
- if ISite.providedBy(folder):
+ if zope.component.interfaces.ISite.providedBy(folder):
yield folder.getSiteManager()
Modified: zope.site/trunk/src/zope/site/interfaces.py
===================================================================
--- zope.site/trunk/src/zope/site/interfaces.py 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/src/zope/site/interfaces.py 2009-11-18 09:34:13 UTC (rev 105805)
@@ -22,7 +22,6 @@
import zope.container.constraints
import zope.location.interfaces
-from zope.location.interfaces import IPossibleSite
from zope.annotation.interfaces import IAttributeAnnotatable
@@ -80,7 +79,8 @@
zope.container.constraints.containers(
ILocalSiteManager, '.ISiteManagementFolder')
-class IFolder(zope.container.interfaces.IContainer, IPossibleSite,
+class IFolder(zope.container.interfaces.IContainer,
+ zope.component.interfaces.IPossibleSite,
IAttributeAnnotatable):
"""The standard Zope Folder object interface."""
Modified: zope.site/trunk/src/zope/site/site.py
===================================================================
--- zope.site/trunk/src/zope/site/site.py 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/src/zope/site/site.py 2009-11-18 09:34:13 UTC (rev 105805)
@@ -67,7 +67,7 @@
This is a mix-in that implements the IPossibleSite
interface; for example, it is used by the Folder implementation.
"""
- zope.interface.implements(zope.location.interfaces.IPossibleSite)
+ zope.interface.implements(zope.component.interfaces.IPossibleSite)
_sm = None
@@ -78,7 +78,7 @@
raise ComponentLookupError('no site manager defined')
def setSiteManager(self, sm):
- if zope.location.interfaces.ISite.providedBy(self):
+ if zope.component.interfaces.ISite.providedBy(self):
raise TypeError("Already a site")
if zope.component.interfaces.IComponentLookup.providedBy(sm):
@@ -87,7 +87,7 @@
raise ValueError('setSiteManager requires an IComponentLookup')
zope.interface.directlyProvides(
- self, zope.location.interfaces.ISite,
+ self, zope.component.interfaces.ISite,
zope.interface.directlyProvidedBy(self))
zope.event.notify(interfaces.NewLocalSite(sm))
@@ -103,7 +103,7 @@
# there was not enough context; probably run from a test
return None
- if zope.location.interfaces.ISite.providedBy(site):
+ if zope.component.interfaces.ISite.providedBy(site):
return site.getSiteManager()
@@ -211,7 +211,7 @@
"""
current = ob
while True:
- if zope.location.interfaces.ISite.providedBy(current):
+ if zope.component.interfaces.ISite.providedBy(current):
return current.getSiteManager()
current = getattr(current, '__parent__', None)
if current is None:
Modified: zope.site/trunk/src/zope/site/site.txt
===================================================================
--- zope.site/trunk/src/zope/site/site.txt 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/src/zope/site/site.txt 2009-11-18 09:34:13 UTC (rev 105805)
@@ -15,7 +15,7 @@
has the potential to become a site:
- >>> from zope.location.interfaces import ISite, IPossibleSite
+ >>> from zope.component.interfaces import ISite, IPossibleSite
>>> IPossibleSite.providedBy(myfolder)
True
Modified: zope.site/trunk/src/zope/site/testing.py
===================================================================
--- zope.site/trunk/src/zope/site/testing.py 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/src/zope/site/testing.py 2009-11-18 09:34:13 UTC (rev 105805)
@@ -17,19 +17,19 @@
import zope.app.testing.functional
import zope.component
import zope.component.hooks
+import zope.component.interfaces
import zope.container.interfaces
import zope.site.site
from zope.app.testing.placelesssetup import setUp as placelessSetUp
from zope.app.testing.placelesssetup import tearDown as placelessTearDown
from zope.component.interfaces import IComponentLookup
from zope.interface import Interface
-from zope.location.interfaces import ISite
from zope.site import LocalSiteManager, SiteManagerAdapter, SiteManagerContainer
from zope.site.folder import rootFolder
def createSiteManager(folder, setsite=False):
- if not ISite.providedBy(folder):
+ if not zope.component.interfaces.ISite.providedBy(folder):
folder.setSiteManager(LocalSiteManager(folder))
if setsite:
zope.component.hooks.setSite(folder)
Modified: zope.site/trunk/src/zope/site/tests/test_site.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_site.py 2009-11-18 09:26:50 UTC (rev 105804)
+++ zope.site/trunk/src/zope/site/tests/test_site.py 2009-11-18 09:34:13 UTC (rev 105805)
@@ -21,7 +21,7 @@
import zope.interface
import zope.interface.verify
from zope.testing import doctest
-from zope.location.interfaces import ISite, IPossibleSite
+from zope.component.interfaces import ISite, IPossibleSite
from zope.site import folder
More information about the checkins
mailing list