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

[dreamcatcher at codespeak.net]

Author: dreamcatcher
Date: Tue Aug  3 21:14:28 2004
New Revision: 5863

Modified:
   z3/Five/trunk/fiveconfigure.py
   z3/Five/trunk/viewable.py
Log:
Should always try to set fallbacks. And make BrowserDefault a new-style class

Modified: z3/Five/trunk/fiveconfigure.py
==============================================================================
--- z3/Five/trunk/fiveconfigure.py	(original)
+++ z3/Five/trunk/fiveconfigure.py	Tue Aug  3 21:14:28 2004
@@ -94,9 +94,9 @@
             # if there's an existing bobo_traverse hook already, use that
             # as the traversal fallback method
             setattr(class_, '__fallback_traverse__', class_.__bobo_traverse__)
-        if not hasattr(class_, '__fallback_traverse__'):
-            setattr(class_, '__fallback_traverse__',
-                    Traversable.__fallback_traverse__)
+    if not hasattr(class_, '__fallback_traverse__'):
+        setattr(class_, '__fallback_traverse__',
+                Traversable.__fallback_traverse__)
 
     setattr(class_, '__bobo_traverse__', Traversable.__bobo_traverse__)
     setattr(class_, '__five_traversable__', True)
@@ -125,9 +125,9 @@
         # as the fallback
         if not isFiveMethod(class_.__browser_default__):
             setattr(class_, '__fallback_default__', class_.__browser_default__)
-        if not hasattr(class_, '__fallback_default__'):
-            setattr(class_, '__fallback_default__',
-                    Viewable.__fallback_default__)
+    if not hasattr(class_, '__fallback_default__'):
+        setattr(class_, '__fallback_default__',
+                Viewable.__fallback_default__)
 
     if hasattr(class_, '__call__'):
         # Only touch __call__ if the class is already callable.

Modified: z3/Five/trunk/viewable.py
==============================================================================
--- z3/Five/trunk/viewable.py	(original)
+++ z3/Five/trunk/viewable.py	Tue Aug  3 21:14:28 2004
@@ -70,7 +70,7 @@
         return self.fallback_call__(*args, **kw)
     __call__.__five_method__ = True
 
-class BrowserDefault:
+class BrowserDefault(object):
 
     implements(IBrowserDefault)