[Checkins] SVN: z3c.pt/trunk/ If supplied context and request are trivial, get them from the view instance.

[Malthe Borch]

Log message for revision 97336:
  If supplied context and request are trivial, get them from the view instance.

Changed:
  U   z3c.pt/trunk/CHANGES.txt
  U   z3c.pt/trunk/src/z3c/pt/pagetemplate.py

-=-
Modified: z3c.pt/trunk/CHANGES.txt
===================================================================
--- z3c.pt/trunk/CHANGES.txt	2009-02-27 09:39:25 UTC (rev 97335)
+++ z3c.pt/trunk/CHANGES.txt	2009-02-27 10:28:19 UTC (rev 97336)
@@ -3,6 +3,9 @@
 
 In next release
 
+- If the supplied ``context`` and ``request`` parameters are trivial,
+  get them from the view instance. [malthe]
+
 - Expressions in text templates are never escaped. [malthe]
 
 - Do not bind template to a trivial instance. [malthe]

Modified: z3c.pt/trunk/src/z3c/pt/pagetemplate.py
===================================================================
--- z3c.pt/trunk/src/z3c/pt/pagetemplate.py	2009-02-27 09:39:25 UTC (rev 97335)
+++ z3c.pt/trunk/src/z3c/pt/pagetemplate.py	2009-02-27 10:28:19 UTC (rev 97336)
@@ -165,12 +165,16 @@
     keyword arguments are passed in through the ``options``
     dictionary. Note that the default expression type for this class
     is 'path' (standard Zope traversal)."""
-
+    
     def _pt_get_context(self, view, request, kwargs):
+        context = kwargs.get('context')
+        if context is None:
+            context = view.context
+        request = request or kwargs.get('request') or view.request
         return dict(
             view=view,
-            context=kwargs.get('context', view.context),
-            request=request or kwargs.get('request', view.request),
+            context=context,
+            request=request,
             template=self,
             path=evaluate_path,
             exists=evaluate_exists,