[Zope-Checkins] CVS: Zope/lib/python/ZPublisher - BaseRequest.py:1.39.20.5 Browser.py:1.1.2.3

[Shane Hathaway]

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

Modified Files:
      Tag: ComponentArchitecture-branch
	BaseRequest.py Browser.py 
Log Message:
Added some temporary debugging code, changed _publish to _default, and
fixed the handling of the return value from _browser_default().


=== Zope/lib/python/ZPublisher/BaseRequest.py 1.39.20.4 => 1.39.20.5 ===
 from string import join, split, find, rfind, lower, upper
 from urllib import quote
+from cgi import escape
 
 UNSPECIFIED_ROLES=''
 
@@ -292,8 +293,13 @@
             o, add_steps = default(self)
             if add_steps:
                 if len(add_steps) > 1:
+                    # 2 or more steps added
                     path.extend(add_steps[1:])
+                # 1 step added
                 return o, add_steps[0]
+            elif o is not object:
+                # no steps added but object changed.
+                return o, ()
         m = self._request_method
         if m == 'GET' or m == 'POST':
             default = 'index_html'
@@ -350,7 +356,8 @@
                         TypeError, AttributeError):
                     if self.response.debug_mode:
                         raise StopTraversal, self.response.debugError(
-                            "Cannot locate object at: %s" % self['URL']) 
+                            "Cannot locate object named %s of %s" % (
+                            entry_name, escape(repr(object))))
                     else:
                         raise StopTraversal, self.response.notFoundError(
                             self['URL'])


=== Zope/lib/python/ZPublisher/Browser.py 1.1.2.2 => 1.1.2.3 ===
 
 ComponentArchitecture.providePresentation(
-    LeafContent, '_publish', BrowserPublish, LeafContentBrowserPublish)
+    LeafContent, '_default', BrowserPublish, LeafContentBrowserPublish)