py2/py3: explicitly cast to list for dict.keys() or dict.items() + list.

bt5/erp5_data_notebook/ExtensionTemplateItem/portal_components/extension.erp5.JupyterCompile.py

@@ -17,6 +17,7 @@ import Acquisition
 import astor
 import importlib
 from erp5.component.module.Log import log
+from Products.ERP5Type.Utils import ensure_list
 
 # Display matplotlib figure automatically like
 # the original python kernel
@@ -495,7 +496,7 @@ def Base_runJupyterCode(self, jupyter_code, old_notebook_context):
 
     # Saves a list of all the variables we injected into the user context and
     # shall be deleted before saving the context.
-    volatile_variable_list = current_setup_dict.keys() + inject_variable_dict.keys() + user_context.get('_volatile_variable_list', [])
+    volatile_variable_list = ensure_list(current_setup_dict.keys()) + ensure_list(inject_variable_dict.keys()) + user_context.get('_volatile_variable_list', [])
     volatile_variable_list.append('__builtins__')
 
     for key, val in user_context.items():

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/ERP5Site_filterRequestForDeferredStyle.py

+from Products.ERP5Type.Utils import ensure_list
 new_request = {}
 
-for k, v in request.other.items() + request.form.items():
+for k, v in ensure_list(request.other.items()) + ensure_list(request.form.items()):
   if k not in ('TraversalRequestNameStack', 'AUTHENTICATED_USER', 'URL',
       'SERVER_URL', 'AUTHENTICATION_PATH', 'USER_PREF_LANGUAGES', 'PARENTS',
       'PUBLISHED', 'AcceptLanguage', 'AcceptCharset', 'RESPONSE', 'SESSION',

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.py

@@ -9,6 +9,7 @@ It will also not work if strict security is set on simulation. It's recommended
 delivery builder.
 """
 from erp5.component.module.Log import log
+from Products.ERP5Type.Utils import ensure_list
 LOG = lambda msg:log(
           "Delivery_setCausalityFromSimulation on %s" % context.getPath(), msg)
 LOG = lambda msg:'DISABLED'
@@ -36,4 +37,4 @@ for simulation_movement in simulation_movement_list :
     causality_value_set[explanation_value] = 1
 
 LOG('setCausalityValueList %s'%causality_value_set.keys())
-delivery.setCausalityValueList(causality_value_set.keys() + delivery.getCausalityValueList())
+delivery.setCausalityValueList(ensure_list(causality_value_set.keys()) + ensure_list(delivery.getCausalityValueList()))

bt5/erp5_trade/TestTemplateItem/portal_components/test.erp5.testOrderBuilder.py

@@ -27,6 +27,7 @@
 #
 ##############################################################################
 
+from Products.ERP5Type.Utils import ensure_list
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from DateTime import DateTime
 from Products.ERP5Type.tests.Sequence import SequenceList
@@ -239,7 +240,7 @@ class TestOrderBuilderMixin(TestOrderMixin, InventoryAPITestCase):
     self.wanted_quantity_matrix = self.decrease_quantity_matrix.copy()
 
     packing_list_line.setVariationCategoryList(
-      self.decrease_quantity_matrix.keys(),
+      ensure_list(self.decrease_quantity_matrix.keys()),
     )
 
     self.tic()

product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.DomainTool.py

@@ -32,6 +32,7 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
 from Products.ERP5Type import Permissions
 from Products.ERP5Type.Tool.BaseTool import BaseTool
+from Products.ERP5Type.Utils import ensure_list
 from Products.ZSQLCatalog.SQLCatalog import SimpleQuery, ComplexQuery
 import six
 
@@ -337,7 +338,7 @@ class DomainTool(BaseTool):
       mapped_value = self.getPortalObject().newContent(temp_object=True,
         portal_type='Supply Cell', id='multivalued_mapped_value')
       mapped_value._setMappedValuePropertyList(
-        mapped_value_property_dict.keys())
+        ensure_list(mapped_value_property_dict.keys()))
       mapped_value.__dict__.update(mapped_value_property_dict)
       return mapped_value
 

product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.sql

@@ -13,7 +13,7 @@
 
 <dtml-if quantity_unit_conversion_dict>
 DELETE FROM `quantity_unit_conversion` WHERE
-  <dtml-sqltest "quantity_unit_conversion_dict.keys()" column="resource_uid" type="int" multiple>
+  <dtml-sqltest expr="set(quantity_unit_conversion_dict.keys())" column="resource_uid" type="int" multiple>
 
   <dtml-var sql_delimiter>
 

product/ERP5Type/mixin/matrix.py

@@ -30,7 +30,7 @@ from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
 from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
-from Products.ERP5Type.Utils import cartesianProduct, INFINITE_SET
+from Products.ERP5Type.Utils import cartesianProduct, ensure_list, INFINITE_SET
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 
 from zLOG import LOG
@@ -163,7 +163,7 @@ class Matrix(object):
       else:
         delete = set()
         to_delete.append(delete)
-        for k, v in id_dict.items():
+        for k, v in ensure_list(id_dict.items()):
           try:
             axis.remove(k)
             if last_id < v: