[Zope3-checkins] CVS: Zope3/src/zope/app/traversing - namespace.py:1.24

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/traversing
In directory cvs.zope.org:/tmp/cvs-serv27642/src/zope/app/traversing

Modified Files:
	namespace.py 
Log Message:


etc() was depending on IRootFolder. That is not necessary, because all
it needs is to know whether it's dealing with the root object or not.
IContainmentRoot does that.




=== Zope3/src/zope/app/traversing/namespace.py 1.23 => 1.24 ===
--- Zope3/src/zope/app/traversing/namespace.py:1.23	Tue Feb 24 09:11:17 2004
+++ Zope3/src/zope/app/traversing/namespace.py	Tue Feb 24 11:51:05 2004
@@ -15,11 +15,11 @@
 
 $Id$
 """
+import re
 from zope.app import zapi
 from zope.exceptions import NotFoundError
 from zope.app.interfaces.traversing import ITraversable
 from zope.proxy import removeAllProxies
-import re
 
 class UnexpectedParameters(NotFoundError):
     "Unexpected namespace parameters were provided."
@@ -146,7 +146,7 @@
 
 from zope.app.applicationcontrol.applicationcontrol \
     import applicationController
-from zope.app.interfaces.content.folder import IRootFolder
+from zope.app.interfaces.traversing import IContainmentRoot
 def etc(name, parameters, pname, ob, request):
     # XXX
 
@@ -164,7 +164,7 @@
         raise UnexpectedParameters(parameters)
 
     if (name in ('process', 'ApplicationController')
-        and IRootFolder.isImplementedBy(ob)):
+        and IContainmentRoot.isImplementedBy(ob)):
         return applicationController
 
     if name not in ('site', 'Services'):