py2/py3: cast dict.keys() to list.

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
@@ -240,7 +241,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/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: