[Zope3-checkins] CVS: zopeproducts/zwiki - configure.zcml:1.26 traversal.py:1.4 wikipage.py:1.9

[Philipp von Weitershausen]

Update of /cvs-repository/zopeproducts/zwiki
In directory cvs.zope.org:/tmp/cvs-serv3518

Modified Files:
	configure.zcml traversal.py wikipage.py 
Log Message:
Fixes for parentgeddon:

- ContextWrappers are gone

- use setitem instead of setObject


=== zopeproducts/zwiki/configure.zcml 1.25 => 1.26 ===
--- zopeproducts/zwiki/configure.zcml:1.25	Tue Aug 12 22:44:34 2003
+++ zopeproducts/zwiki/configure.zcml	Thu Sep 25 11:06:31 2003
@@ -91,13 +91,6 @@
         permission="zope.ManageContent"
         description="Minimal Wiki Page Container implementation " />
 
-    <allow
-        interface="zope.app.interfaces.services.service.Read" />
-
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.interfaces.services.service.Write" />
-
     <require
         permission="zope.View"
         interface="zope.app.interfaces.container.IReadContainer"/>


=== zopeproducts/zwiki/traversal.py 1.3 => 1.4 ===
--- zopeproducts/zwiki/traversal.py:1.3	Thu Jun  5 09:34:24 2003
+++ zopeproducts/zwiki/traversal.py	Thu Sep 25 11:06:31 2003
@@ -22,7 +22,6 @@
 from zope.app.traversing import getParent
 
 from zope.proxy import removeAllProxies
-from zope.app.context import ContextWrapper
 
 from zope.app.interfaces.traversing import ITraversable
 from zope.app.traversing.namespace import UnexpectedParameters
@@ -49,8 +48,7 @@
 
             raise NotFoundError(self.context, name, request)
 
-        subob = removeAllProxies(subob)
-        return ContextWrapper(subob, self.wiki, name=name)
+        return removeAllProxies(subob)
 
     def browserDefault(self, request):
         c = self.context


=== zopeproducts/zwiki/wikipage.py 1.8 => 1.9 ===
--- zopeproducts/zwiki/wikipage.py:1.8	Thu Jul 31 14:00:48 2003
+++ zopeproducts/zwiki/wikipage.py	Thu Sep 25 11:06:31 2003
@@ -20,7 +20,6 @@
 
 from zope.interface import implements
 from zope.component import getAdapter
-from zope.app.context import ContextWrapper
 from zope.app.traversing import getParent, getName
 
 from zope.app.interfaces.index.text import ISearchableText
@@ -99,25 +98,22 @@
             return [self.context]
         wiki = getParent(self.context)
         name = self.getParents()[0]
-        wrapped = ContextWrapper(wiki[name], wiki, name=name)
-        hier = getAdapter(wrapped, IWikiPageHierarchy)
+        hier = getAdapter(wiki[name], IWikiPageHierarchy)
         return hier.path() + [self.context]
 
-
     def findChildren(self, recursive=True):
         "See zopeproducts.zwiki.interfaces.IWikiPageHierarchy"
         wiki = getParent(self.context)
         contextName = getName(self.context)
         children = []
         for pageName in wiki:
-            wrapped = ContextWrapper(wiki[pageName], wiki, name=pageName)
-            hier = getAdapter(wrapped, IWikiPageHierarchy)
+            hier = getAdapter(wiki[pageName], IWikiPageHierarchy)
             if contextName in hier.getParents():
                 if recursive:
                     subs = hier.findChildren()
                 else:
                     subs = ()
-                children.append((wrapped, subs))
+                children.append((wiki[pageName], subs))
         return tuple(children)