[Checkins] SVN: z3c.pt/trunk/ Update to most recent Chameleon.

[Malthe Borch]

Log message for revision 111091:
  Update to most recent Chameleon.

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

-=-
Modified: z3c.pt/trunk/CHANGES.txt
===================================================================
--- z3c.pt/trunk/CHANGES.txt	2010-04-19 13:23:26 UTC (rev 111090)
+++ z3c.pt/trunk/CHANGES.txt	2010-04-19 13:24:42 UTC (rev 111091)
@@ -3,6 +3,8 @@
 
 In next release...
 
+- Fixed compatibility issue with recent change in Chameleon.
+
 - Fixed regression introduced with ``args`` being passed
   in. Incidentally, the name ``args`` was used as the star argument
   name.

Modified: z3c.pt/trunk/setup.py
===================================================================
--- z3c.pt/trunk/setup.py	2010-04-19 13:23:26 UTC (rev 111090)
+++ z3c.pt/trunk/setup.py	2010-04-19 13:24:42 UTC (rev 111091)
@@ -10,7 +10,7 @@
     'zope.i18n >= 3.5',
     'zope.traversing',
     'zope.contentprovider',
-    'Chameleon >= 1.2.0',
+    'Chameleon >= 1.2.3',
     ]
 
 if sys.version_info[:3] < (2,5,0):

Modified: z3c.pt/trunk/src/z3c/pt/pagetemplate.py
===================================================================
--- z3c.pt/trunk/src/z3c/pt/pagetemplate.py	2010-04-19 13:23:26 UTC (rev 111090)
+++ z3c.pt/trunk/src/z3c/pt/pagetemplate.py	2010-04-19 13:24:42 UTC (rev 111091)
@@ -69,12 +69,12 @@
     _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:
@@ -84,7 +84,8 @@
         _expr_cache[code_cache_key] = code
 
     # execute code and return evaluation
-    exec code in codegen.lookup_globals.copy(), _locals
+    _locals[config.SYMBOLS.lookup_attr] = codegen.lookup_attr
+    exec code in _locals
     return _locals['result']
 
 def evaluate_path(expr):