[Erp5-report] r10705 - in /erp5/trunk/bt5/erp5_budget: SkinTemplateItem/portal_skins/erp5_b...

[nobody at svn.erp5.org]

Author: alex
Date: Fri Oct 13 17:59:48 2006
New Revision: 10705

URL: http://svn.erp5.org?rev=10705&view=rev
Log:
replaced filter(lambda ...) by more readable list comprehension

Modified:
    erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
    erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
    erp5/trunk/bt5/erp5_budget/bt/revision

Modified: erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml?rev=10705&r1=10704&r2=10705&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml (original)
+++ erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_asCellRange.xml Fri Oct 13 17:59:48 2006
@@ -75,15 +75,14 @@
 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
-\n
-cell_range = filter(lambda x: x != [], cell_range )\n
+        base_category_list=(base_category,)))\n
+\n
+cell_range = [x for x in cell_range if x != []]\n
+\n
 \n
 return cell_range\n
 \n
@@ -188,8 +187,10 @@
                             <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>

Modified: erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml?rev=10705&r1=10704&r2=10705&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml (original)
+++ erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetLine_view/membership_criterion_base_category_list.xml Fri Oct 13 17:59:48 2006
@@ -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>

Modified: erp5/trunk/bt5/erp5_budget/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/bt/revision?rev=10705&r1=10704&r2=10705&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/bt/revision (original)
+++ erp5/trunk/bt5/erp5_budget/bt/revision Fri Oct 13 17:59:48 2006
@@ -1,1 +1,1 @@
-4
+7