[#149][#189] Pretty print output XML

Based on
50399b5

Author: Bjwebb

examples/iati/expected.xml

@@ -1 +1,57 @@
-<iati-activities><!--XML generated by flatten-tool--><iati-activity><iati-identifier>AA-AAA-123456789-ABC123</iati-identifier><reporting-org ref="AA-AAA-123456789" type="40"><narrative>Organisation name</narrative></reporting-org><participating-org ref="AA-AAA-123456789" role="1"/><activity-status code="2"/><activity-date iso-date="2011-10-01" type="1"/><recipient-country code="AF" percentage="40"/><recipient-country code="XK" percentage="60"/><title><narrative>A title</narrative></title><description><narrative>A description</narrative></description><transaction><transaction-type code="2"/><transaction-date iso-date="2012-01-01"/><value value-date="2012-01-01">10</value></transaction><transaction><transaction-type code="3"/><transaction-date iso-date="2012-03-03"/><value value-date="2012-03-03">20</value></transaction></iati-activity><iati-activity><iati-identifier>AA-AAA-123456789-ABC124</iati-identifier><reporting-org ref="AA-AAA-123456789" type="40"><narrative>Organisation name</narrative></reporting-org><participating-org ref="AA-AAA-123456789" role="1"/><activity-status code="3"/><activity-date iso-date="2016-01-01" type="2"/><recipient-country code="AG" percentage="30"/><recipient-country code="XK" percentage="70"/><title><narrative>Another title</narrative></title><description><narrative>Another description</narrative></description><transaction><transaction-type code="2"/><transaction-date iso-date="2013-04-04"/><value value-date="2013-04-04">30</value></transaction><transaction><transaction-type code="3"/><transaction-date iso-date="2013-05-05"/><value value-date="2013-05-05">40</value></transaction></iati-activity></iati-activities>
+<iati-activities>
+  <!--XML generated by flatten-tool-->
+  <iati-activity>
+    <iati-identifier>AA-AAA-123456789-ABC123</iati-identifier>
+    <reporting-org ref="AA-AAA-123456789" type="40">
+      <narrative>Organisation name</narrative>
+    </reporting-org>
+    <participating-org ref="AA-AAA-123456789" role="1"/>
+    <activity-status code="2"/>
+    <activity-date iso-date="2011-10-01" type="1"/>
+    <recipient-country code="AF" percentage="40"/>
+    <recipient-country code="XK" percentage="60"/>
+    <title>
+      <narrative>A title</narrative>
+    </title>
+    <description>
+      <narrative>A description</narrative>
+    </description>
+    <transaction>
+      <transaction-type code="2"/>
+      <transaction-date iso-date="2012-01-01"/>
+      <value value-date="2012-01-01">10</value>
+    </transaction>
+    <transaction>
+      <transaction-type code="3"/>
+      <transaction-date iso-date="2012-03-03"/>
+      <value value-date="2012-03-03">20</value>
+    </transaction>
+  </iati-activity>
+  <iati-activity>
+    <iati-identifier>AA-AAA-123456789-ABC124</iati-identifier>
+    <reporting-org ref="AA-AAA-123456789" type="40">
+      <narrative>Organisation name</narrative>
+    </reporting-org>
+    <participating-org ref="AA-AAA-123456789" role="1"/>
+    <activity-status code="3"/>
+    <activity-date iso-date="2016-01-01" type="2"/>
+    <recipient-country code="AG" percentage="30"/>
+    <recipient-country code="XK" percentage="70"/>
+    <title>
+      <narrative>Another title</narrative>
+    </title>
+    <description>
+      <narrative>Another description</narrative>
+    </description>
+    <transaction>
+      <transaction-type code="2"/>
+      <transaction-date iso-date="2013-04-04"/>
+      <value value-date="2013-04-04">30</value>
+    </transaction>
+    <transaction>
+      <transaction-type code="3"/>
+      <transaction-date iso-date="2013-05-05"/>
+      <value value-date="2013-05-05">40</value>
+    </transaction>
+  </iati-activity>
+</iati-activities>

flattentool/tests/fixtures/iati-org.xml

@@ -1 +1,7 @@
-<iati-organisations><!--XML generated by flatten-tool--><iati-organisation><organisation-identifier>AA-AAA-123456789</organisation-identifier><reporting-org ref="AA-AAA-123456789" secondary-reporter="0" type="40"/></iati-organisation></iati-organisations>
+<iati-organisations>
+  <!--XML generated by flatten-tool-->
+  <iati-organisation>
+    <organisation-identifier>AA-AAA-123456789</organisation-identifier>
+    <reporting-org ref="AA-AAA-123456789" secondary-reporter="0" type="40"/>
+  </iati-organisation>
+</iati-organisations>

flattentool/xml_output.py

@@ -78,4 +78,8 @@ def toxml(data, xml_root_tag):
     root = dict_to_xml(data, xml_root_tag, nsmap=nsmap)
     comment = ET.Comment('XML generated by flatten-tool')
     root.insert(0, comment)
-    return ET.tostring(root)
+    if USING_LXML:
+        return ET.tostring(root, pretty_print=True)
+    else:
+        indent(root)
+        return ET.tostring(root)