Merge remote-tracking branch 'upstream/master' into zope4py2

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffObjectList.py

 from Products.ERP5Type.Document import newTempBase
 from Products.ERP5Type.Cache import CachingMethod
 from Products.ERP5.Document.BusinessTemplate import TemplateConditionError
+import six
 
 # get selected business templates
 p = context.getPortalObject()

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.py

 from Products.ERP5Type.Document import newTempBase
 from Products.ERP5Type.Cache import CachingMethod
-from Products.ERP5Type.Utils import ensure_list
 import six
 Base_translateString = context.Base_translateString
 

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.py

@@ -47,7 +47,7 @@ save_and_remove_title = Base_translateString('Backup And Remove')
 for bt in bt_id_list:
   bt_title, modified_object_list = bt_object_dict[bt]
   for i, (object_id, value) in enumerate(sorted(six.iteritems(modified_object_list))):
-    object_state, object_class = modified_object_list[object_id]
+    object_state, object_class = value
     object_id = bt+'|'+object_id
     line = newTempBase(context, 'tmp_install_%s' % i)