Rename classes / fns to remove mention of IATI

Author: andylolz

flattentool/sort_iati.py

@@ -41,7 +41,7 @@
 }
 
 
-class IATISchemaWalker(object):
+class XMLSchemaWalker(object):
     """
     Class for traversing one or more XML schemas.
 
@@ -117,7 +117,7 @@ def create_schema_dict(self, parent_name, parent_element=None):
             for name, element, _, _, _ in self.element_loop(parent_element, '')])
 
 
-def sort_iati_element(element, schema_subdict):
+def sort_element(element, schema_subdict):
     """
     Sort the given element's children according to the order of schema_subdict.
     """
@@ -134,4 +134,4 @@ def index_key(x):
 
     for child in sorted(children, key=index_key):
         element.append(child)
-        sort_iati_element(child, schema_subdict.get(child.tag, {}))
+        sort_element(child, schema_subdict.get(child.tag, {}))

flattentool/xml_output.py

@@ -13,7 +13,7 @@
     USING_LXML = False
     warn('Using stdlib etree may work, but is not supported. Please install lxml.')
 from flattentool.exceptions import DataErrorWarning
-from flattentool.sort_iati import sort_iati_element, IATISchemaWalker
+from flattentool.sort_iati import sort_element, XMLSchemaWalker
 
 
 def sort_attributes(data):
@@ -78,9 +78,9 @@ def toxml(data, xml_root_tag, xml_schemas=None, root_list_path='iati-activity'):
     }
     root = dict_to_xml(data, xml_root_tag, nsmap=nsmap)
     if xml_schemas is not None:
-        schema_dict = IATISchemaWalker(xml_schemas).create_schema_dict(root_list_path)
+        schema_dict = XMLSchemaWalker(xml_schemas).create_schema_dict(root_list_path)
         for element in root:
-            sort_iati_element(element, schema_dict)
+            sort_element(element, schema_dict)
     comment = ET.Comment('XML generated by flatten-tool')
     root.insert(0, comment)
     if USING_LXML: