[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/rotterdam - xmlobject.py:1.14

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/browser/skins/rotterdam
In directory cvs.zope.org:/tmp/cvs-serv10028/src/zope/app/browser/skins/rotterdam

Modified Files:
	xmlobject.py 
Log Message:
Revert my changes from yesterday. Though it *always* adds a ++etc++site
to the list, it will only be returned when it can be traversed. Acc. to
the unit tests, an ISite might not have a ++etc++site (which is NOT in
line with its interface description, btw).

We clearly need to give this an overhaul. A possiblity is to use
zope.app.tree to make it stateful.


=== Zope3/src/zope/app/browser/skins/rotterdam/xmlobject.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/xmlobject.py:1.13	Thu Feb 19 09:33:48 2004
+++ Zope3/src/zope/app/browser/skins/rotterdam/xmlobject.py	Fri Feb 20 04:16:43 2004
@@ -18,7 +18,6 @@
 
 from zope.publisher.browser import BrowserView
 from zope.app import zapi
-from zope.app.interfaces.services.service import ISite
 from zope.app.interfaces.container import IReadContainer
 from zope.app.traversing import getParents, getParent, traverse
 from zope.interface import Interface
@@ -61,9 +60,8 @@
 
         keys = list(container.keys())
 
-        if ISite.isImplementedBy(container):
-            # include the service manager
-            keys.append('++etc++site')
+        # include the service manager
+        keys.append('++etc++site')
 
         for name in keys:
 
@@ -114,9 +112,8 @@
             else:
                 keys = []
 
-            if ISite.isImplementedBy(item):
-                # include the service manager
-                keys.append('++etc++site')
+            # include the service manager
+            keys.append('++etc++site')
 
             for name in keys:
                 # Only include items we can traverse to