Commit c6590985 authored by Nicolas Delaby's avatar Nicolas Delaby

Small optimisation:

* Use dict.setdefault instead of testing existence of key inside a dictionary

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40171 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 63cd23c7
...@@ -62,6 +62,7 @@ if resource is not None:\n ...@@ -62,6 +62,7 @@ if resource is not None:\n
else :\n else :\n
not_option_base_category_list = ()\n not_option_base_category_list = ()\n
\n \n
del default_sub_field_property_dict[\'item_list\']\n
for item in item_list:\n for item in item_list:\n
# Get value of the item\n # Get value of the item\n
item_value = item[int(not is_right_display)]\n item_value = item[int(not is_right_display)]\n
...@@ -70,25 +71,16 @@ for item in item_list:\n ...@@ -70,25 +71,16 @@ for item in item_list:\n
item_key = string.join(item_split[:split_depth] , \'/\' )\n item_key = string.join(item_split[:split_depth] , \'/\' )\n
base_category = item_split[0]\n base_category = item_split[0]\n
\n \n
if not sub_field_dict.has_key(item_key):\n sub_field_property_dict = sub_field_dict.setdefault(item_key, default_sub_field_property_dict.copy())\n
# Create property dict\n \n
sub_field_property_dict = default_sub_field_property_dict.copy()\n
sub_field_property_dict[\'key\'] = item_key\n sub_field_property_dict[\'key\'] = item_key\n
required_value = 0\n sub_field_property_dict[\'required\'] = int(base_category in not_option_base_category_list)\n
if base_category in not_option_base_category_list:\n
required_value = 1\n
sub_field_property_dict[\'required\'] = required_value\n
sub_field_property_dict[\'field_type\'] = \'ListField\'\n sub_field_property_dict[\'field_type\'] = \'ListField\'\n
sub_field_property_dict[\'size\'] = 1\n sub_field_property_dict[\'size\'] = 1\n
sub_field_property_dict[\'item_list\'] = [(\'\',\'\')]\n sub_field_property_dict.setdefault(\'item_list\', [(\'\', \'\')]).extend([item])\n
sub_field_property_dict[\'value\'] = []\n if item_value in value_list:\n
sub_field_dict[item_key] = sub_field_property_dict\n # Only one value per variation\n
\n sub_field_property_dict[\'value\'] = item_value\n
sub_field_dict[item_key][\'item_list\'] =\\\n
sub_field_dict[item_key][\'item_list\'] + [item]\n
\n
if item in value_list:\n
sub_field_dict[item_key][\'value\'] = item\n
\n \n
return sub_field_dict.values()\n return sub_field_dict.values()\n
</string> </value> </string> </value>
...@@ -139,6 +131,7 @@ return sub_field_dict.values()\n ...@@ -139,6 +131,7 @@ return sub_field_dict.values()\n
<string>resource</string> <string>resource</string>
<string>None</string> <string>None</string>
<string>not_option_base_category_list</string> <string>not_option_base_category_list</string>
<string>_write_</string>
<string>_getiter_</string> <string>_getiter_</string>
<string>item</string> <string>item</string>
<string>_getitem_</string> <string>_getitem_</string>
...@@ -149,8 +142,6 @@ return sub_field_dict.values()\n ...@@ -149,8 +142,6 @@ return sub_field_dict.values()\n
<string>item_key</string> <string>item_key</string>
<string>base_category</string> <string>base_category</string>
<string>sub_field_property_dict</string> <string>sub_field_property_dict</string>
<string>_write_</string>
<string>required_value</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
1018 1020
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment