Commit 2c2c53cc authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

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

parent bd97dcd6
...@@ -17,6 +17,7 @@ import Acquisition ...@@ -17,6 +17,7 @@ import Acquisition
import astor import astor
import importlib import importlib
from erp5.component.module.Log import log from erp5.component.module.Log import log
from Products.ERP5Type.Utils import ensure_list
# Display matplotlib figure automatically like # Display matplotlib figure automatically like
# the original python kernel # the original python kernel
...@@ -495,7 +496,7 @@ def Base_runJupyterCode(self, jupyter_code, old_notebook_context): ...@@ -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 # Saves a list of all the variables we injected into the user context and
# shall be deleted before saving the context. # 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__') volatile_variable_list.append('__builtins__')
for key, val in user_context.items(): for key, val in user_context.items():
......
from Products.ERP5Type.Utils import ensure_list
new_request = {} 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', if k not in ('TraversalRequestNameStack', 'AUTHENTICATED_USER', 'URL',
'SERVER_URL', 'AUTHENTICATION_PATH', 'USER_PREF_LANGUAGES', 'PARENTS', 'SERVER_URL', 'AUTHENTICATION_PATH', 'USER_PREF_LANGUAGES', 'PARENTS',
'PUBLISHED', 'AcceptLanguage', 'AcceptCharset', 'RESPONSE', 'SESSION', 'PUBLISHED', 'AcceptLanguage', 'AcceptCharset', 'RESPONSE', 'SESSION',
......
...@@ -9,6 +9,7 @@ It will also not work if strict security is set on simulation. It's recommended ...@@ -9,6 +9,7 @@ It will also not work if strict security is set on simulation. It's recommended
delivery builder. delivery builder.
""" """
from erp5.component.module.Log import log from erp5.component.module.Log import log
from Products.ERP5Type.Utils import ensure_list
LOG = lambda msg:log( LOG = lambda msg:log(
"Delivery_setCausalityFromSimulation on %s" % context.getPath(), msg) "Delivery_setCausalityFromSimulation on %s" % context.getPath(), msg)
LOG = lambda msg:'DISABLED' LOG = lambda msg:'DISABLED'
...@@ -36,4 +37,4 @@ for simulation_movement in simulation_movement_list : ...@@ -36,4 +37,4 @@ for simulation_movement in simulation_movement_list :
causality_value_set[explanation_value] = 1 causality_value_set[explanation_value] = 1
LOG('setCausalityValueList %s'%causality_value_set.keys()) 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()))
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# #
############################################################################## ##############################################################################
from Products.ERP5Type.Utils import ensure_list
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from DateTime import DateTime from DateTime import DateTime
from Products.ERP5Type.tests.Sequence import SequenceList from Products.ERP5Type.tests.Sequence import SequenceList
...@@ -239,7 +240,7 @@ class TestOrderBuilderMixin(TestOrderMixin, InventoryAPITestCase): ...@@ -239,7 +240,7 @@ class TestOrderBuilderMixin(TestOrderMixin, InventoryAPITestCase):
self.wanted_quantity_matrix = self.decrease_quantity_matrix.copy() self.wanted_quantity_matrix = self.decrease_quantity_matrix.copy()
packing_list_line.setVariationCategoryList( packing_list_line.setVariationCategoryList(
self.decrease_quantity_matrix.keys(), ensure_list(self.decrease_quantity_matrix.keys()),
) )
self.tic() self.tic()
......
...@@ -32,6 +32,7 @@ from AccessControl import ClassSecurityInfo ...@@ -32,6 +32,7 @@ from AccessControl import ClassSecurityInfo
from Products.ERP5Type.Globals import InitializeClass from Products.ERP5Type.Globals import InitializeClass
from Products.ERP5Type import Permissions from Products.ERP5Type import Permissions
from Products.ERP5Type.Tool.BaseTool import BaseTool from Products.ERP5Type.Tool.BaseTool import BaseTool
from Products.ERP5Type.Utils import ensure_list
from Products.ZSQLCatalog.SQLCatalog import SimpleQuery, ComplexQuery from Products.ZSQLCatalog.SQLCatalog import SimpleQuery, ComplexQuery
import six import six
...@@ -337,7 +338,7 @@ class DomainTool(BaseTool): ...@@ -337,7 +338,7 @@ class DomainTool(BaseTool):
mapped_value = self.getPortalObject().newContent(temp_object=True, mapped_value = self.getPortalObject().newContent(temp_object=True,
portal_type='Supply Cell', id='multivalued_mapped_value') portal_type='Supply Cell', id='multivalued_mapped_value')
mapped_value._setMappedValuePropertyList( mapped_value._setMappedValuePropertyList(
mapped_value_property_dict.keys()) ensure_list(mapped_value_property_dict.keys()))
mapped_value.__dict__.update(mapped_value_property_dict) mapped_value.__dict__.update(mapped_value_property_dict)
return mapped_value return mapped_value
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<dtml-if quantity_unit_conversion_dict> <dtml-if quantity_unit_conversion_dict>
DELETE FROM `quantity_unit_conversion` WHERE 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> <dtml-var sql_delimiter>
......
...@@ -30,7 +30,7 @@ from Products.ERP5Type.Globals import InitializeClass, PersistentMapping ...@@ -30,7 +30,7 @@ from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
from Acquisition import aq_base from Acquisition import aq_base
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from Products.ERP5Type import Permissions 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 Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
from zLOG import LOG from zLOG import LOG
...@@ -163,7 +163,7 @@ class Matrix(object): ...@@ -163,7 +163,7 @@ class Matrix(object):
else: else:
delete = set() delete = set()
to_delete.append(delete) to_delete.append(delete)
for k, v in id_dict.items(): for k, v in ensure_list(id_dict.items()):
try: try:
axis.remove(k) axis.remove(k)
if last_id < v: if last_id < v:
......
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