[Zope3-checkins] SVN: Zope3/trunk/src/zope/publisher/ Renamed 'object' to 'obj' since 'object' now builtin name

[Dmitry Vasiliev]

Log message for revision 66940:
  Renamed 'object' to 'obj' since 'object' now builtin name
  

Changed:
  U   Zope3/trunk/src/zope/publisher/base.py
  U   Zope3/trunk/src/zope/publisher/browser.py
  U   Zope3/trunk/src/zope/publisher/http.py

-=-
Modified: Zope3/trunk/src/zope/publisher/base.py
===================================================================
--- Zope3/trunk/src/zope/publisher/base.py	2006-04-13 23:41:41 UTC (rev 66939)
+++ Zope3/trunk/src/zope/publisher/base.py	2006-04-14 09:27:13 UTC (rev 66940)
@@ -263,7 +263,7 @@
         'See IPublisherRequest'
         return 0
 
-    def traverse(self, object):
+    def traverse(self, obj):
         'See IPublisherRequest'
 
         publication = self.publication
@@ -271,30 +271,28 @@
         traversal_stack = self._traversal_stack
         traversed_names = self._traversed_names
 
-        self._last_obj_traversed = object
-
         prev_object = None
         while True:
 
-            if object is not prev_object:
+            self._last_obj_traversed = obj
+
+            if obj is not prev_object:
                 # Invoke hooks (but not more than once).
-                publication.callTraversalHooks(self, object)
+                publication.callTraversalHooks(self, obj)
 
-            prev_object = object
-
-            if traversal_stack:
-                # Traverse to the next step.
-                entry_name = traversal_stack.pop()
-                traversed_names.append(entry_name)
-                subobject = publication.traverseName(
-                    self, object, entry_name)
-                self._last_obj_traversed = object = subobject
-            else:
+            if not traversal_stack:
                 # Finished traversal.
                 break
 
-        return object
+            prev_object = obj
 
+            # Traverse to the next step.
+            entry_name = traversal_stack.pop()
+            traversed_names.append(entry_name)
+            obj = publication.traverseName(self, obj, entry_name)
+
+        return obj
+
     def close(self):
         'See IPublicationRequest'
 

Modified: Zope3/trunk/src/zope/publisher/browser.py
===================================================================
--- Zope3/trunk/src/zope/publisher/browser.py	2006-04-13 23:41:41 UTC (rev 66939)
+++ Zope3/trunk/src/zope/publisher/browser.py	2006-04-14 09:27:13 UTC (rev 66940)
@@ -494,10 +494,10 @@
                         elif not val in item:
                             item.append(val)
 
-    def traverse(self, object):
+    def traverse(self, obj):
         'See IPublisherRequest'
 
-        ob = super(BrowserRequest, self).traverse(object)
+        ob = super(BrowserRequest, self).traverse(obj)
         method = self.method
 
         base_needed = 0

Modified: Zope3/trunk/src/zope/publisher/http.py
===================================================================
--- Zope3/trunk/src/zope/publisher/http.py	2006-04-13 23:41:41 UTC (rev 66939)
+++ Zope3/trunk/src/zope/publisher/http.py	2006-04-14 09:27:13 UTC (rev 66940)
@@ -445,10 +445,10 @@
         request._retry_count = self._retry_count
         return request
 
-    def traverse(self, object):
+    def traverse(self, obj):
         'See IPublisherRequest'
 
-        ob = super(HTTPRequest, self).traverse(object)
+        ob = super(HTTPRequest, self).traverse(obj)
         if self._path_suffix:
             self._traversal_stack = self._path_suffix
             ob = super(HTTPRequest, self).traverse(ob)