[Checkins] SVN: zope.site/trunk/ don't import moved zope.traversing.interface.IContainmentRoot

Thomas Lotze tl at gocept.com
Tue Feb 3 14:46:59 EST 2009


Log message for revision 96046:
  don't import moved zope.traversing.interface.IContainmentRoot

Changed:
  U   zope.site/trunk/CHANGES.txt
  U   zope.site/trunk/src/zope/site/interfaces.py
  U   zope.site/trunk/src/zope/site/site.py

-=-
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt	2009-02-03 17:43:54 UTC (rev 96045)
+++ zope.site/trunk/CHANGES.txt	2009-02-03 19:46:59 UTC (rev 96046)
@@ -5,7 +5,8 @@
 3.6.1 (unreleased)
 ------------------
 
-- ...
+- Import symbols moved from zope.traversing to zope.location from the new
+  location.
 
 3.6.0 (2009-1-31)
 -----------------

Modified: zope.site/trunk/src/zope/site/interfaces.py
===================================================================
--- zope.site/trunk/src/zope/site/interfaces.py	2009-02-03 17:43:54 UTC (rev 96045)
+++ zope.site/trunk/src/zope/site/interfaces.py	2009-02-03 19:46:59 UTC (rev 96046)
@@ -19,9 +19,9 @@
 import zope.interface
 import zope.component.interfaces
 import zope.container.interfaces
+import zope.location.interfaces
 
 from zope.location.interfaces import IPossibleSite
-from zope.traversing.interfaces import IContainmentRoot
 from zope.annotation.interfaces import IAttributeAnnotatable
 
                     
@@ -84,5 +84,5 @@
               IAttributeAnnotatable):
     """The standard Zope Folder object interface."""
 
-class IRootFolder(IFolder, IContainmentRoot):
+class IRootFolder(IFolder, zope.location.interfaces.IRoot):
     """The standard Zope root Folder object interface."""

Modified: zope.site/trunk/src/zope/site/site.py
===================================================================
--- zope.site/trunk/src/zope/site/site.py	2009-02-03 17:43:54 UTC (rev 96045)
+++ zope.site/trunk/src/zope/site/site.py	2009-02-03 19:46:59 UTC (rev 96046)
@@ -32,9 +32,9 @@
 import zope.component.interfaces
 import zope.traversing.api
 import zope.location
+import zope.location.interfaces
 
 from zope.component.interfaces import ComponentLookupError
-from zope.traversing.interfaces import IContainmentRoot
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.filerepresentation.interfaces import IDirectoryFactory
 
@@ -115,7 +115,7 @@
 
 def _findNextSiteManager(site):
     while True:
-        if IContainmentRoot.providedBy(site):
+        if zope.location.interfaces.IRoot.providedBy(site):
             # we're the root site, return None
             return None
 



More information about the Checkins mailing list