Changeset 1119 for trunk

Timestamp:

Apr 22, 2010, 12:02:28 AM (13 years ago)

Author:

cmlenz

Message:

Fix for infinite recursion when parsing argument names from tuples. Closes #383.

Location:

trunk/genshi/template

Files:

• eval.py (modified) (1 diff)
• tests/eval.py (modified) (1 diff)

trunk/genshi/template/eval.py

@@ -500 +500 @@
             elif isinstance(node, _ast.Tuple):
                 for elt in node.elts:
-                    _process(node)
+                    _process(elt)
         if hasattr(node, 'args'):
             for arg in node.args:

trunk/genshi/template/tests/eval.py

@@ -248 +248 @@
         expr = Expression("filter(lambda x: x > 2, items)")
         self.assertEqual([3, 4], expr.evaluate(data))
+
+    def test_lambda_tuple_arg(self):
+        data = {'items': [(1, 2), (2, 1)]}
+        expr = Expression("filter(lambda (x, y): x > y, items)")
+        self.assertEqual([(2, 1)], expr.evaluate(data))
 
     def test_list_comprehension(self):