Remove iteritems from dict loops for python3

Python3 has removed this and made .items() a view.

Author: SpamapS

src/saml2/__init__.py

@@ -173,7 +173,7 @@ def transfer_to_element_tree(self):
         else:
             element_tree.tag = self.tag
 
-        for key, value in self.attributes.iteritems():
+        for key, value in iter(self.attributes.items()):
             element_tree.attrib[key] = value
 
         for child in self.children:
@@ -277,7 +277,7 @@ def _extension_element_from_element_tree(element_tree):
         namespace = None
         tag = elementc_tag
     extension = ExtensionElement(namespace=namespace, tag=tag)
-    for key, value in element_tree.attrib.iteritems():
+    for key, value in iter(element_tree.attrib.items()):
         extension.attributes[key] = value
     for child in element_tree:
         extension.children.append(_extension_element_from_element_tree(child))
@@ -302,7 +302,7 @@ def harvest_element_tree(self, tree):
         # Fill in the instance members from the contents of the XML tree.
         for child in tree:
             self._convert_element_tree_to_member(child)
-        for attribute, value in tree.attrib.iteritems():
+        for attribute, value in iter(tree.attrib.items()):
             self._convert_element_attribute_to_member(attribute, value)
         self.text = tree.text
 
@@ -317,7 +317,7 @@ def _convert_element_attribute_to_member(self, attribute, value):
     def _add_members_to_element_tree(self, tree):
         for child in self.extension_elements:
             child.become_child_element_of(tree)
-        for attribute, value in self.extension_attributes.iteritems():
+        for attribute, value in iter(self.extension_attributes.items()):
             tree.attrib[attribute] = value
         tree.text = self.text
 
@@ -456,7 +456,7 @@ def _get_all_c_children_with_order(self):
             for child in self.c_child_order:
                 yield child
         else:
-            for _, values in self.__class__.c_children.iteritems():
+            for _, values in iter(self.__class__.c_children.items()):
                 yield values[0]
 
     def _convert_element_tree_to_member(self, child_tree):
@@ -507,7 +507,7 @@ def _add_members_to_element_tree(self, tree):
                 member.become_child_element_of(tree)
         # Convert the members of this class which are XML attributes.
         for xml_attribute, attribute_info in \
-                self.__class__.c_attributes.iteritems():
+                iter(self.__class__.c_attributes.items()):
             (member_name, member_type, required) = attribute_info
             member = getattr(self, member_name)
             if member is not None:
@@ -902,7 +902,7 @@ def element_to_extension_element(element):
     exel.children.extend(element.extension_elements)
 
     for xml_attribute, (member_name, typ, req) in \
-            element.c_attributes.iteritems():
+            iter(element.c_attributes.items()):
         member_value = getattr(element, member_name)
         if member_value is not None:
             exel.attributes[xml_attribute] = member_value

src/saml2/httputil.py

@@ -165,7 +165,7 @@ def extract(environ, empty=False, err=False):
     """
     formdata = cgi.parse(environ['wsgi.input'], environ, empty, err)
     # Remove single entries from lists
-    for key, value in formdata.iteritems():
+    for key, value in iter(formdata.items()):
         if len(value) == 1:
             formdata[key] = value[0]
     return formdata

src/saml2/saml.py

@@ -250,7 +250,7 @@ def harvest_element_tree(self, tree):
         # Fill in the instance members from the contents of the XML tree.
         for child in tree:
             self._convert_element_tree_to_member(child)
-        for attribute, value in tree.attrib.iteritems():
+        for attribute, value in iter(tree.attrib.items()):
             self._convert_element_attribute_to_member(attribute, value)
         if tree.text:
             #print("set_text:", tree.text)

tools/parse_xsd2.py

@@ -865,7 +865,7 @@ def __init__(self, elem):
         self.scoped = False
         self.itemType = None
 
-        for attribute, value in elem.attrib.iteritems():            
+        for attribute, value in iter(elem.attrib.items()):
             self.__setattr__(attribute, value)
 
     def collect(self, top, sup, argv=None, parent=""):
@@ -1046,7 +1046,7 @@ def __init__(self, elem):
         self.scoped = False
         self.abstract = False
 
-        for attribute, value in elem.attrib.iteritems():
+        for attribute, value in iter(elem.attrib.items()):
             self.__setattr__(attribute, value)
 
         try: