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

[Yvo Schubbe]

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

Modified Files:
      Tag: Zope-2_6-branch
	BaseRequest.py 
Log Message:
Merged yuppie-collector1079-branch:
- Fixed BaseRequest's traversal loop. (Collector #1079)
Some whitespace cleanup in CHANGES.txt.

=== Zope/lib/python/ZPublisher/BaseRequest.py 1.50.2.1 => 1.50.2.2 ===
--- Zope/lib/python/ZPublisher/BaseRequest.py:1.50.2.1	Fri May 30 11:22:00 2003
+++ Zope/lib/python/ZPublisher/BaseRequest.py	Tue Oct 14 05:04:49 2003
@@ -10,7 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__version__='$Revision$'[11:-2]
+""" Basic ZPublisher request management.
+
+$Id$
+"""
 
 from urllib import quote
 import xmlrpc
@@ -269,13 +272,13 @@
                         request['TraversalRequestNameStack'] = path
                         continue
                     else:
-                        method = default_path[0]
-                        entry_name = method
+                        entry_name = default_path[0]
                 elif (method and hasattr(object,method)
                       and entry_name != method
                       and getattr(object, method) is not None):
                     request._hacked_path=1
                     entry_name = method
+                    method = 'index_html'
                 else:
                     if (hasattr(object, '__call__') and
                         hasattr(object.__call__,'__roles__')):
@@ -284,7 +287,6 @@
                         i=URL.rfind('/')
                         if i > 0: response.setBase(URL[:i])
                     break
-                if not entry_name: continue
                 step = quote(entry_name)
                 _steps.append(step)
                 request['URL'] = URL = '%s/%s' % (request['URL'], step)