[Checkins] SVN: five.pt/trunk/ Added call-support for old-style classes in path expressions.

[Malthe Borch]

Log message for revision 93023:
  Added call-support for old-style classes in path expressions.

Changed:
  U   five.pt/trunk/CHANGES.txt
  U   five.pt/trunk/src/five/pt/expressions.py

-=-
Modified: five.pt/trunk/CHANGES.txt
===================================================================
--- five.pt/trunk/CHANGES.txt	2008-11-16 22:43:39 UTC (rev 93022)
+++ five.pt/trunk/CHANGES.txt	2008-11-16 22:44:26 UTC (rev 93023)
@@ -4,6 +4,9 @@
 HEAD
 ----
 
+- Added call-support for old-style classes in path
+  expressions. [malthe]
+
 - Added monkey-patches to replace template engine for module-level
   view page template instances. [malthe]
 

Modified: five.pt/trunk/src/five/pt/expressions.py
===================================================================
--- five.pt/trunk/src/five/pt/expressions.py	2008-11-16 22:43:39 UTC (rev 93022)
+++ five.pt/trunk/src/five/pt/expressions.py	2008-11-16 22:44:26 UTC (rev 93023)
@@ -35,10 +35,13 @@
                         base = traversePathElement(
                             base, name, path_items[i:], request=request)
 
-        if call and getattr(base, '__call__', _marker) is not _marker:
+        if call is False:
+            return base
+        
+        if getattr(base, '__call__', _marker) is not _marker or callable(base):
             # here's where we're different from the standard path
             # traverser
-            return render(base, ob)
+            base = render(base, ob)
 
         return base