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

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	namespace.py 
Log Message:
merged Folder and RootFolder

=== Zope3/src/zope/app/traversing/namespace.py 1.19.2.3 => 1.19.2.4 ===
--- Zope3/src/zope/app/traversing/namespace.py:1.19.2.3	Tue Sep  9 14:08:20 2003
+++ Zope3/src/zope/app/traversing/namespace.py	Fri Sep 12 16:46:29 2003
@@ -148,7 +148,7 @@
 
 from zope.app.applicationcontrol.applicationcontrol \
     import applicationController
-from zope.app.content.folder import RootFolder
+from zope.app.interfaces.content.folder import IRootFolder
 def etc(name, parameters, pname, ob, request):
     # XXX
 
@@ -166,7 +166,7 @@
         raise UnexpectedParameters(parameters)
 
     if (name in ('process', 'ApplicationController')
-        and ob.__class__ == RootFolder):
+        and IRootFolder.isImplementedBy(ob)):
         return applicationController
 
     if name not in ('site', 'Services'):