From 5eb0b5800648bfa9fa8108f9124cc10a611e9fd4 Mon Sep 17 00:00:00 2001
From: Alexandre Boeglin <alex@nexedi.com>
Date: Fri, 13 Oct 2006 15:59:48 +0000
Subject: [PATCH] replaced filter(lambda ...) by more readable list
 comprehension

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10705 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_budget/BudgetLine_asCellRange.xml      | 17 +++++++++--------
 .../membership_criterion_base_category_list.xml |  2 +-
 bt5/erp5_budget/bt/revision                     |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
index f882a34005..8d674f7a3f 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
@@ -75,15 +75,14 @@ base_category_list = context.getVariationBaseCategoryList()\n
 for base_category in base_category_list:\n
   if matrixbox == 1:\n
     # XXX matrixbox is right_display (not as listfield) => invert display and value in item\n
-    cell_range.append(map(lambda x: (x[1],x[0]), \n
-                                    context.getVariationCategoryItemList(\n
-                                           base_category_list=(base_category,),\n
-                                           display_base_category=1)))\n
+    cell_range.append([(x[1], x[0]) for x in context.getVariationCategoryItemList(\n
+        base_category_list=(base_category,), display_base_category=1)])\n
   else:\n
     cell_range.append(context.getVariationCategoryList(\n
-                                   base_category_list=(base_category,)))\n
+        base_category_list=(base_category,)))\n
+\n
+cell_range = [x for x in cell_range if x != []]\n
 \n
-cell_range = filter(lambda x: x != [], cell_range )\n
 \n
 return cell_range\n
 \n
@@ -188,8 +187,10 @@ return cell_range\n
                             <string>base_category_list</string>
                             <string>_getiter_</string>
                             <string>base_category</string>
-                            <string>map</string>
-                            <string>filter</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>x</string>
+                            <string>_getitem_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
index 1515befc15..c4b9ed7031 100644
--- a/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
+++ b/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
@@ -317,7 +317,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.getVariationBaseCategoryList()</string> </value>
+            <value> <string>here/getVariationBaseCategoryList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_budget/bt/revision b/bt5/erp5_budget/bt/revision
index bf0d87ab1b..c7930257df 100644
--- a/bt5/erp5_budget/bt/revision
+++ b/bt5/erp5_budget/bt/revision
@@ -1 +1 @@
-4
\ No newline at end of file
+7
\ No newline at end of file
-- 
2.30.9