[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication - PublicationTraverse.py:1.1.2.20 Traversers.py:1.1.2.20 ZopePublication.py:1.1.2.41

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	PublicationTraverse.py Traversers.py ZopePublication.py 
Log Message:
Implemented:

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/PathNamespaceQualificationSyntax

without a short-hand syntax for the creation namespace which may go
away.



=== Zope3/lib/python/Zope/App/ZopePublication/PublicationTraverse.py 1.1.2.19 => 1.1.2.20 ===
         nm = name # the name to look up the object with
 
-        if ':' in name or ';' in name:
+        if name and name[:1] in '@+':
             # Process URI segment parameters. 
             ns, nm, parms = parameterizedNameParse(name)
 


=== Zope3/lib/python/Zope/App/ZopePublication/Traversers.py 1.1.2.19 => 1.1.2.20 ===
             view_name = getDefaultViewName(ob, request)
 
-            return ob, (("view::%s" % view_name),)
+            return ob, (("@@%s" % view_name),)
         
         return ob, ()
 
     def publishTraverse(self, request, name):
         ob = self.target
-        if name.startswith('view::'):
+        if name.startswith('@@'):
             return getView(ob, name[6:], request)
             
         if name.startswith('_'):


=== Zope3/lib/python/Zope/App/ZopePublication/ZopePublication.py 1.1.2.40 => 1.1.2.41 ===
     def getApplication(self, request):
 
-        # If the first name is 'etc::ApplicationControl', then we should
+        # If the first name is '++etc++ApplicationControl', then we should
         # get it rather than look in the database!
         stack = request.getTraversalStack()
         if stack:
             name = stack[-1]
-            if (name.startswith('etc::ApplicationController') and
-                (name == 'etc::ApplicationController' or
-                 name.startswith('etc::ApplicationController;'))):
+            if name == '++etc++ApplicationController':
                 stack.pop() # consume the name
                 request.setTraversalStack(stack) # Reset the stack
                 return self.traverseName(request, None, name)