[Checkins] SVN: z3c.pt/trunk/ Updated run-time expression evaluator method to work after a recent architectural change in Chameleon.

[Malthe Borch]

Log message for revision 100156:
  Updated run-time expression evaluator method to work after a recent architectural change in Chameleon.

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-05-20 06:27:36 UTC (rev 100155)
+++ z3c.pt/trunk/CHANGES.txt	2009-05-20 07:04:36 UTC (rev 100156)
@@ -1,6 +1,11 @@
 Changelog
 ---------
 
+In next release...
+
+- Updated run-time expression evaluator method to work after a recent
+  architectural change in Chameleon. [malthe]
+
 - Check that we have a non-trivial response-object before trying to
   set the content type. [malthe]
 

Modified: z3c.pt/trunk/src/z3c/pt/pagetemplate.py
===================================================================
--- z3c.pt/trunk/src/z3c/pt/pagetemplate.py	2009-05-20 06:27:36 UTC (rev 100155)
+++ z3c.pt/trunk/src/z3c/pt/pagetemplate.py	2009-05-20 07:04:36 UTC (rev 100156)
@@ -68,11 +68,13 @@
 
     _locals = frame.f_locals
     _locals.update(symbol_mapping)
+    _locals.update(_locals['econtext'])
     
     # to support dynamic scoping (like in templates), we must
     # transform the code to take the scope locals into account; for
     # efficiency, this is cached for reuse
     code_cache_key = key, tuple(_locals)
+    
     try:
         code = _expr_cache[code_cache_key]
     except KeyError: