Py3: Use six.iteritems

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/TemplateTool_checkSlapOSPASConsistency.py

+import six
 portal = context.getPortalObject()
 slapos_plugin_dict = {
   'IExtractionPlugin': [
@@ -23,7 +24,7 @@ def mergePASDictDifference(portal, d, fixit):
   plugins = portal.acl_users.plugins
   plugin_type_info = plugins.listPluginTypeInfo()
   error_list = []
-  for plugin, active_list in d.iteritems():
+  for plugin, active_list in six.iteritems(d):
     plugin_info = [q for q in plugin_type_info if q['id'] == plugin][0]
     found_list = plugins.listPlugins(plugin_info['interface'])
     meta_type_list = [q[1].meta_type for q in found_list]

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSCodingStyle.py

@@ -27,6 +27,7 @@
 ##############################################################################
 
 import unittest
+import six
 from Products.ERP5Type.tests.CodingStyleTestCase import CodingStyleTestCase
 from Products.ERP5Type import CodingStyle
 
@@ -374,7 +375,7 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
         if skin_id in skin_id_list:
           try:
             document = self.portal.portal_skins[skin_id][document_id]
-            for _, content in content_dict.iteritems():
+            for _, content in six.iteritems(content_dict):
               if document.getId() in content:
                 message_list.append(skin_path)
                 break
@@ -414,7 +415,7 @@ def makeTestSlapOSCodingStyleTestCase(tested_business_template):
             continue
 
           found = 0
-          for _, content in content_dict.iteritems():
+          for _, content in six.iteritems(content_dict):
             if document.getId() in content:
               found = 1
               break