[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication - PublicationTraverse.py:1.5

[Jeremy Hylton]

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

Modified Files:
	PublicationTraverse.py 
Log Message:
Code cleanup.


=== Zope3/lib/python/Zope/App/ZopePublication/PublicationTraverse.py 1.4 => 1.5 ===
 ##############################################################################
 """
 
-Revision information: $Id$
+$Id$
 """
 
 from Zope.ComponentArchitecture import queryView, getService
@@ -38,7 +38,6 @@
 class PublicationTraverse:
 
     def traverseName(self, request, ob, name):
-
         nm = name # the name to look up the object with
 
         if name and name[:1] in '@+':
@@ -47,9 +46,7 @@
 
             unknown_parms = ()
             for pname, pval in parms:
-                pset = getattr(self, "_parameterSet%s" % pname,
-                               self # marker
-                               )
+                pset = getattr(self, "_parameterSet%s" % pname, self) # marker
                 if pset is self:
                     # We don't know about this one
                     unknown_parms += ((pname, pval),)
@@ -77,11 +74,10 @@
         if IPublishTraverse.isImplementedBy(removeAllProxies(ob)):
             ob2 = ob.publishTraverse(request, nm)
         else:
-            adapter = queryView(ob, '_traverse', request, self # marker
-                                     ) 
-
+            adapter = queryView(ob, '_traverse', request, self) # marker
             if adapter is not self:
-                ob2 =  adapter.publishTraverse(request, nm)
+                print ob, adapter, nm
+                ob2 = adapter.publishTraverse(request, nm)
             else:
                 raise NotFound(ob, name, request)