[z3-checkins] r18133 - z3/Five/trunk

[jw at codespeak.net]

Author: jw
Date: Tue Oct  4 14:58:26 2005
New Revision: 18133

Modified:
   z3/Five/trunk/CHANGES.txt
   z3/Five/trunk/traversable.py
Log:
After having applied this fix to the 1.0 and 1.1 branches
a while ago, this traversal fix is now on the trunk too.

Modified: z3/Five/trunk/CHANGES.txt
==============================================================================
--- z3/Five/trunk/CHANGES.txt	(original)
+++ z3/Five/trunk/CHANGES.txt	Tue Oct  4 14:58:26 2005
@@ -8,6 +8,9 @@
 Others
 ------
 
+* FiveTraversable should only do a view lookup and not call the traverse 
+  method of its superclass.
+
 * Added a (temporarily) forked copy of the "new-and-improved" test runner
   and supporting 'zope.testing' package, lifted from
   http://svn.zope.org/zope.testing.  This code should be removed for Five

Modified: z3/Five/trunk/traversable.py
==============================================================================
--- z3/Five/trunk/traversable.py	(original)
+++ z3/Five/trunk/traversable.py	Tue Oct  4 14:58:26 2005
@@ -98,10 +98,8 @@
         REQUEST = getattr(context, 'REQUEST', None)
         if not IBrowserRequest.providedBy(REQUEST):
             REQUEST = FakeRequest()
-        # Try to lookup a view first
+        # Try to lookup a view
         try:
             return getView(context, name, REQUEST)
         except ComponentLookupError:
             pass
-        # If a view can't be found, then use default traversable
-        return super(FiveTraversable, self).traverse(name, furtherPath)