[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - BaseRequest.py:1.39.20.3

Shane Hathaway shane@digicool.com
Wed, 3 Oct 2001 18:03:24 -0400


Update of /cvs-repository/Zope/lib/python/ZPublisher
In directory cvs.zope.org:/tmp/cvs-serv24118

Modified Files:
      Tag: ComponentArchitecture-branch
	BaseRequest.py 
Log Message:
Minor cleanup, mostly cosmetic


=== Zope/lib/python/ZPublisher/BaseRequest.py 1.39.20.2 => 1.39.20.3 ===
         object=parents[-1]
         del parents[:]
-
         object, roles = self._initialTraverse(object)
         parents.append(object)
 
         steps=self.steps
         self._steps = _steps = map(quote, steps)
         path.reverse()
-
         request['TraversalRequestNameStack'] = request.path = path
 
         entry_name = ''
@@ -482,16 +480,11 @@
                             i=rfind(URL,'/')
                             if i > 0: self.response.setBase(URL[:i])
                         break
-                    
-                if object is None:
-                    # Finished traversal.
-                    break
                 if not entry_name:
                     continue
                 step = quote(entry_name)
                 _steps.append(step)
                 request['URL'] = '%s/%s' % (request['URL'], step)
-
                 try:
                     object, r = self._traverseName(object, entry_name)
                     if r is not UNSPECIFIED_ROLES:
@@ -499,7 +492,6 @@
                 except StopTraversal, v:
                     return v
                 parents.append(object)
-
                 steps.append(entry_name)
         finally:
             parents.reverse()