Commit aaf73895 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

use omit_optional_variation instead of omit_option_base_category to suppress deprecation warnings.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27549 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e083db1d
...@@ -59,7 +59,7 @@ resource = context.getResourceValue()\n ...@@ -59,7 +59,7 @@ resource = context.getResourceValue()\n
cell_range = []\n cell_range = []\n
if resource is not None:\n if resource is not None:\n
base_category_list = resource.getVariationBaseCategoryList(\n base_category_list = resource.getVariationBaseCategoryList(\n
omit_option_base_category=1)\n omit_optional_variation=1)\n
\n \n
for base_category in base_category_list:\n for base_category in base_category_list:\n
if matrixbox == 1:\n if matrixbox == 1:\n
......
392 393
\ No newline at end of file \ No newline at end of file
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -67,7 +67,7 @@ if option_variation==1:\n ...@@ -67,7 +67,7 @@ if option_variation==1:\n
# Get option base category list\n # Get option base category list\n
add_predicate = 0\n add_predicate = 0\n
no_option_base_category_list = context.getVariationRangeBaseCategoryList(\n no_option_base_category_list = context.getVariationRangeBaseCategoryList(\n
omit_option_base_category=1)\n omit_optional_variation=1)\n
base_category_list = context.getVariationRangeBaseCategoryList()\n base_category_list = context.getVariationRangeBaseCategoryList()\n
option_base_category_list = [x for x in base_category_list \\\n option_base_category_list = [x for x in base_category_list \\\n
if x not in no_option_base_category_list]\n if x not in no_option_base_category_list]\n
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationRangeBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getVariationBaseCategoryItemList(omit_option_base_category=1)</string> </value> <value> <string>python: here.getVariationBaseCategoryItemList(omit_optional_variation=1)</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
322 323
\ No newline at end of file \ No newline at end of file
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
resource = context.getResourceValue()\n resource = context.getResourceValue()\n
cell_range = []\n cell_range = []\n
if resource is not None:\n if resource is not None:\n
base_category_list = resource.getVariationBaseCategoryList(omit_option_base_category=1)\n base_category_list = resource.getVariationBaseCategoryList(omit_optional_variation=1)\n
\n \n
for base_category in base_category_list:\n for base_category in base_category_list:\n
if matrixbox == 1:\n if matrixbox == 1:\n
......
...@@ -62,7 +62,7 @@ split_depth = 1\n ...@@ -62,7 +62,7 @@ split_depth = 1\n
resource = context.getResourceValue()\n resource = context.getResourceValue()\n
if resource is not None:\n if resource is not None:\n
not_option_base_category_list = resource.getVariationBaseCategoryList(\n not_option_base_category_list = resource.getVariationBaseCategoryList(\n
omit_option_base_category=1)\n omit_optional_variation=1)\n
else :\n else :\n
not_option_base_category_list = ()\n not_option_base_category_list = ()\n
\n \n
......
668 669
\ 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