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

[Christian Theune]

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

Modified Files:
      Tag: Zope-2_7-posttraverse
	BaseRequest.py 
Log Message:
 - fixed final issues


=== Zope/lib/python/ZPublisher/BaseRequest.py 1.51.14.2 => 1.51.14.3 ===
--- Zope/lib/python/ZPublisher/BaseRequest.py:1.51.14.2	Sat Oct  4 08:31:45 2003
+++ Zope/lib/python/ZPublisher/BaseRequest.py	Fri Oct 17 05:14:51 2003
@@ -434,9 +434,6 @@
                     elif roles is UNSPECIFIED_ROLES: user=v(request, auth)
                     else: user=v(request, auth, roles)
 
-        if post_traverse:
-            exec_callables(post_traverse)
-
             if user is None and roles != UNSPECIFIED_ROLES:
                 response.unauthorized()
 
@@ -447,6 +444,12 @@
 
         # Remove http request method from the URL.
         request['URL']=URL
+
+        if post_traverse:
+            exec_callables(post_traverse)
+
+        return object
+
     def post_traverse(self, f, args):
         """Set a callable object and argument tuple to be combined if traversal succeeds"""
         self._post_traverse.append((f, tuple(args)))
@@ -475,7 +478,6 @@
             LOG('PostTraverse', ERROR,
                 'Error while invoking hook: "%s"' % `f`,
                 error=sys.exc_info())
-        return object
 
 def old_validation(groups, request, auth,
                    roles=UNSPECIFIED_ROLES):