misc: iteritems() -> items() (#36515)

wcs/ctl/management/commands/trigger_jumps.py

@@ -108,7 +108,7 @@ def get_formdata_accepting_trigger(formdef, trigger, status_ids=None):
 
 def match_row(substitution_variables, row):
     select = row['select']
-    for key, value in select.iteritems():
+    for key, value in select.items():
         if str(substitution_variables.get(key)) != str(value):
             return False
     return True

wcs/fields.py

@@ -960,7 +960,7 @@ class FileField(WidgetField):
                and cur_dt != document_types[document_type_id]:
             cur_dt = document_types[document_type_id]
         options = [(None, '---', {})]
-        options += [(doc_type, doc_type['label'], key) for key, doc_type in document_types.iteritems()]
+        options += [(doc_type, doc_type['label'], key) for key, doc_type in document_types.items()]
         form.add(SingleSelectWidget, 'document_type', title=_('File type suggestion'),
                 value=cur_dt, options=options,
                 advanced=not(cur_dt))
@@ -1073,7 +1073,7 @@ class FileField(WidgetField):
         }
         # Local document types
         document_types.update(get_cfg('filetypes', {}))
-        for key, document_type in document_types.iteritems():
+        for key, document_type in document_types.items():
             document_type['id'] = key
         # add current file type if it does not exist anymore in the settings
         cur_dt = self.document_type or {}
@@ -1089,7 +1089,7 @@ class FileField(WidgetField):
                 file_type = self.__dict__['file_type']
                 document_types = self.get_document_types()
                 parts = []
-                for key, value in document_types.iteritems():
+                for key, value in document_types.items():
                     if file_type == value.get('mimetypes'):
                         self.document_type = value.copy()
                         self.document_type['id'] = key

wcs/formdata.py

@@ -1073,7 +1073,7 @@ class FormData(StorableObject):
 
         if self.geolocations:
             data['geolocations'] = {}
-            for k, v in self.geolocations.iteritems():
+            for k, v in self.geolocations.items():
                 data['geolocations'][k] = v.copy()
 
         return data

wcs/publisher.py

@@ -171,7 +171,7 @@ class WcsPublisher(StubWcsPublisher):
 
         def _decode_dict(data):
             rv = {}
-            for key, value in data.iteritems():
+            for key, value in data.items():
                 if isinstance(key, unicode):
                     key = key.encode(self.site_charset)
                 if isinstance(value, unicode):

wcs/qommon/misc.py

@@ -509,7 +509,7 @@ def json_encode_helper(d, charset):
         return [json_encode_helper(e, charset) for e in d]
     elif isinstance(d, dict):
         new_d = {}
-        for k, v in d.iteritems():
+        for k, v in d.items():
             new_d[json_encode_helper(k, charset)] = json_encode_helper(v, charset)
         return new_d
     else:

wcs/qommon/saml2.py

@@ -473,7 +473,7 @@ class Saml2Directory(Directory):
         admin_attributes = idp.get('admin-attributes', {'local-admin': 'true'}) or {}
         if admin_attributes:
             is_admin = False
-            for key, matching_value in admin_attributes.iteritems():
+            for key, matching_value in admin_attributes.items():
                 for value in m.get(key, []):
                     if value == matching_value:
                         is_admin = True
@@ -495,7 +495,7 @@ class Saml2Directory(Directory):
 
         if user.form_data is None:
             user.form_data = {}
-        for key, field_id in attribute_mapping.iteritems():
+        for key, field_id in attribute_mapping.items():
             if not key in d:
                 continue
             field_value = d[key]

wcs/workflows.py

@@ -676,7 +676,7 @@ class Workflow(StorableObject):
             root['last_modification_time'] = time.strftime('%Y-%m-%dT%H:%M:%S',
                                                            self.last_modification_time)
         roles = root['functions'] = {}
-        for role, label in self.roles.iteritems():
+        for role, label in self.roles.items():
             roles[role] = force_text(label, charset)
         statuses = root['statuses'] = []
         endpoint_status_ids = [s.id for s in self.get_endpoint_status()]

wcs/wscalls.py

@@ -59,7 +59,7 @@ def call_webservice(url, qs_data=None, request_signature_key=None,
         publisher = get_publisher()
         parsed = urlparse.urlparse(url)
         qs = list(urlparse.parse_qsl(parsed.query))
-        for key, value in qs_data.iteritems():
+        for key, value in qs_data.items():
             try:
                 value = WorkflowStatusItem.compute(value, raises=True)
                 value = str(value)