[Checkins] SVN: zope.app.tree/trunk/ Import ISite from zope.component after it was moved there from zope.location.

[Thomas Lotze]

Log message for revision 105883:
  Import ISite from zope.component after it was moved there from zope.location.
  

Changed:
  U   zope.app.tree/trunk/CHANGES.txt
  U   zope.app.tree/trunk/src/zope/app/tree/adapters.py
  U   zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py
  U   zope.app.tree/trunk/src/zope/app/tree/browser/tests.py
  U   zope.app.tree/trunk/src/zope/app/tree/configure.zcml
  U   zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py

-=-
Modified: zope.app.tree/trunk/CHANGES.txt
===================================================================
--- zope.app.tree/trunk/CHANGES.txt	2009-11-19 16:32:32 UTC (rev 105882)
+++ zope.app.tree/trunk/CHANGES.txt	2009-11-19 16:42:31 UTC (rev 105883)
@@ -5,7 +5,8 @@
 3.6.1 (unreleased)
 ------------------
 
-- ...
+- Import ISite from zope.component after it was moved there from
+  zope.location.
 
 3.6.0 (2009-02-01)
 ------------------

Modified: zope.app.tree/trunk/src/zope/app/tree/adapters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/adapters.py	2009-11-19 16:32:32 UTC (rev 105882)
+++ zope.app.tree/trunk/src/zope/app/tree/adapters.py	2009-11-19 16:42:31 UTC (rev 105883)
@@ -22,16 +22,18 @@
 """
 from zope.interface import Interface, implements
 from zope.component import adapts
-from zope.component.interfaces import ComponentLookupError
 from zope.security import canAccess
 from zope.security.interfaces import Unauthorized
-from zope.location.interfaces import ILocation, ISite
+from zope.location.interfaces import ILocation
 from zope.traversing.api import getParents
 
 from zope.container.interfaces import IReadContainer
 
 from zope.app.tree.interfaces import IUniqueId, IChildObjects
 
+import zope.component.interfaces
+
+
 class StubUniqueId(object):
     implements(IUniqueId)
     adapts(Interface)
@@ -101,7 +103,7 @@
     """Adapter for read containers which are sites as well. The site
     manager will be treated as just another child object.
     """
-    adapts(ISite)
+    adapts(zope.component.interfaces.ISite)
 
     def hasChildren(self):
         if super(ContainerSiteChildObjects, self).hasChildren():
@@ -139,7 +141,7 @@
                 return True
             else:
                 return False
-        except ComponentLookupError:
+        except zope.component.interfaces.ComponentLookupError:
             return False
         except TypeError:
             # we can't check unproxied objects, but unproxied objects

Modified: zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py	2009-11-19 16:32:32 UTC (rev 105882)
+++ zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py	2009-11-19 16:42:31 UTC (rev 105883)
@@ -18,13 +18,15 @@
 import zope.traversing.api
 from zope.traversing.interfaces import IContainmentRoot
 from zope.component.interfaces import IComponentLookup
-from zope.location.interfaces import ISite
 
 from zope.container.interfaces import IContainer
 
 from zope.app.tree.filters import OnlyInterfacesFilter
 from zope.app.tree.browser import StatefulTreeView
 
+import zope.component.interfaces
+
+
 class CookieTreeView(StatefulTreeView):
     """A stateful tree view using cookies to remember the tree state"""
 
@@ -55,7 +57,7 @@
         """
         parent = self.context
         for parent in zope.traversing.api.getParents(self.context):
-            if ISite.providedBy(parent):
+            if zope.component.interfaces.ISite.providedBy(parent):
                 break
         return self.folderTree(parent)
 

Modified: zope.app.tree/trunk/src/zope/app/tree/browser/tests.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/browser/tests.py	2009-11-19 16:32:32 UTC (rev 105882)
+++ zope.app.tree/trunk/src/zope/app/tree/browser/tests.py	2009-11-19 16:42:31 UTC (rev 105883)
@@ -18,11 +18,11 @@
 
 import unittest
 import zope.component
+import zope.component.interfaces
 from zope.component import getMultiAdapter
 from zope.publisher.browser import TestRequest
 from zope.interface import alsoProvides
 from zope.traversing.interfaces import IContainmentRoot
-from zope.location.interfaces import ISite
 from zope.location.traversing import LocationPhysicallyLocatable
 from zope.app.testing import ztapi
 
@@ -78,7 +78,7 @@
     def test_cookie_tree_site_tree(self):
         request = self.makeRequestWithVar()
         alsoProvides(self.items['a'], IContainmentRoot)
-        alsoProvides(self.items['c'], ISite)
+        alsoProvides(self.items['c'], zope.component.interfaces.ISite)
         view = getMultiAdapter((self.items['f'], request),
                                name='cookie_tree')
         cookie_tree = view.siteTree()

Modified: zope.app.tree/trunk/src/zope/app/tree/configure.zcml
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/configure.zcml	2009-11-19 16:32:32 UTC (rev 105882)
+++ zope.app.tree/trunk/src/zope/app/tree/configure.zcml	2009-11-19 16:42:31 UTC (rev 105883)
@@ -42,7 +42,7 @@
 
   <adapter
       provides=".interfaces.IChildObjects"
-      for="zope.location.interfaces.ISite"
+      for="zope.component.interfaces.ISite"
       factory=".adapters.ContainerSiteChildObjects"
       />
 

Modified: zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py	2009-11-19 16:32:32 UTC (rev 105882)
+++ zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py	2009-11-19 16:42:31 UTC (rev 105883)
@@ -22,7 +22,7 @@
 from zope.security.checker import defineChecker
 from zope.security.checker import NamesChecker
 from zope.traversing.interfaces import IContainmentRoot
-from zope.location.interfaces import ILocation, ISite
+from zope.location.interfaces import ILocation
 import zope.traversing.testing
 
 from zope.container.interfaces import IReadContainer
@@ -37,11 +37,14 @@
 from zope.app.tree.adapters import StubUniqueId, StubChildObjects, \
      LocationUniqueId, ContainerChildObjects, ContainerSiteChildObjects
 
+import zope.component.interfaces
+
+
 class SampleContent(object):
     pass
 
 class SampleSite(SampleContainer):
-    implements(ISite)
+    implements(zope.component.interfaces.ISite)
 
     def setSiteManager(self, sm):
         self._sm = sm
@@ -68,7 +71,8 @@
         ztapi.provideAdapter(None, IChildObjects, StubChildObjects)
         ztapi.provideAdapter(ILocation, IUniqueId, LocationUniqueId)
         ztapi.provideAdapter(IReadContainer, IChildObjects, ContainerChildObjects)
-        ztapi.provideAdapter(ISite, IChildObjects, ContainerSiteChildObjects)
+        ztapi.provideAdapter(zope.component.interfaces.ISite,
+                             IChildObjects, ContainerSiteChildObjects)
         ztapi.provideUtility(ITreeStateEncoder, TreeStateEncoder())
         self.makeObjects()