[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Traversing - EtcNamespace.py:1.4.14.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Traversing
In directory cvs.zope.org:/tmp/cvs-serv4974

Modified Files:
      Tag: ctheune-fix_appcontrol-branch
	EtcNamespace.py 
Log Message:
Application controllers should be treated as alternative application
roots.

We take care of this at the start of traversal, so there's nothing to
do here.


=== Zope3/lib/python/Zope/App/Traversing/EtcNamespace.py 1.4 => 1.4.14.1 ===
--- Zope3/lib/python/Zope/App/Traversing/EtcNamespace.py:1.4	Fri Jul 12 15:28:32 2002
+++ Zope3/lib/python/Zope/App/Traversing/EtcNamespace.py	Thu Dec  5 05:12:07 2002
@@ -15,8 +15,6 @@
 
 $Id$
 """
-from Zope.App.OFS.ApplicationControl.ApplicationControl \
-     import ApplicationController
 from Namespaces import provideNamespaceHandler
 from Exceptions import UnexpectedParameters
 from Zope.Exceptions import NotFoundError
@@ -37,8 +35,8 @@
     if parameters:
         raise UnexpectedParameters(parameters)
 
-    if name == 'ApplicationController' and ob is None:
-        return ApplicationController
+    if name == 'ApplicationController':
+        return ob
 
     if name != 'Services':