"pretty-print" with sed instead of xmllint, because of a limitation

in python's xml deserializer (whitespace is significant when
recognizing <None/> nodes, so a general pretty-printer will cause
them to not be recognized.)

This changes empty elements to the more verbose <foo></foo> format,
but that is handled properly by the xml parser.
 - Legacy-Id: 382

Author: fenner

ietf/bin/redirect-dump

@@ -1,2 +1,6 @@
 #!/bin/sh
-python manage.py dumpdata --format=xml redirects | xmllint --format -
+#python manage.py dumpdata --format=xml redirects | xmllint --format -
+python manage.py dumpdata --format=xml redirects | sed -e 's/<\/*object/\
+  &/g' -e 's/<field/\
+    &/g' -e 's/<\/django-objects/\
+&/g'

ietf/redirects/fixtures/initial_data.xml

@@ -3,38 +3,38 @@
   <object pk="1" model="redirects.redirect">
     <field type="CharField" name="cgi">public/liaisons.cgi</field>
     <field type="CharField" name="url">liaisons</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="2" model="redirects.redirect">
     <field type="CharField" name="cgi">public/liaison_detail.cgi</field>
     <field type="CharField" name="url">liaisons</field>
     <field type="CharField" name="rest">%(detail_id)s/</field>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="3" model="redirects.redirect">
     <field type="CharField" name="cgi">public/liaison_managers_list.cgi</field>
     <field type="CharField" name="url">liaisons/managers</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="4" model="redirects.redirect">
     <field type="CharField" name="cgi">public/liaison_guide_to_ietf.cgi</field>
     <field type="CharField" name="url">liaisons/help/to_ietf</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="5" model="redirects.redirect">
     <field type="CharField" name="cgi">public/liaison_guide_from_ietf.cgi</field>
     <field type="CharField" name="url">liaisons/help/from_ietf</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="6" model="redirects.redirect">
     <field type="CharField" name="cgi">public/liaison_field_help.cgi</field>
     <field type="CharField" name="url">liaisons/help/fields</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="7" model="redirects.redirect">
     <field type="CharField" name="cgi">public/idindex.cgi</field>
@@ -46,61 +46,61 @@
     <field type="CharField" name="cgi">public/show_nomcom_message.cgi</field>
     <field type="CharField" name="url">announcements/nomcom</field>
     <field type="CharField" name="rest">%(id)s</field>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="9" model="redirects.redirect">
     <field type="CharField" name="cgi">public/states_table.cgi</field>
     <field type="CharField" name="url">idtracker/states</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="10" model="redirects.redirect">
     <field type="CharField" name="cgi">public/pidtracker.cgi</field>
     <field type="CharField" name="url">idtracker</field>
     <field type="CharField" name="rest">%(dTag)s/%(command)s</field>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="11" model="redirects.redirect">
     <field type="CharField" name="cgi">public/status_of_item.cgi</field>
     <field type="CharField" name="url">idtracker/status</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="12" model="redirects.redirect">
     <field type="CharField" name="cgi">public/lastcall.cgi</field>
     <field type="CharField" name="url">idtracker/last_call</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="13" model="redirects.redirect">
     <field type="CharField" name="cgi">public/rfc_editor_announcement.cgi</field>
     <field type="CharField" name="url">iesg/ann/independent</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="14" model="redirects.redirect">
     <field type="CharField" name="cgi">public/recent_announcement.cgi</field>
     <field type="CharField" name="url">iesg/ann/ietf-doc/recent</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="15" model="redirects.redirect">
     <field type="CharField" name="cgi">public/previous_announcement.cgi</field>
     <field type="CharField" name="url">iesg/ann/ietf-doc/previous</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="16" model="redirects.redirect">
     <field type="CharField" name="cgi">public/view_telechat_minute.cgi</field>
     <field type="CharField" name="url">iesg/telechat</field>
-    <field type="CharField" name="rest"/>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="rest"></field>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="17" model="redirects.redirect">
     <field type="CharField" name="cgi">public/ipr_detail_show.cgi</field>
     <field type="CharField" name="url">ipr</field>
     <field type="CharField" name="rest">ipr-%(ipr_id)s</field>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="4" model="redirects.command">
     <field type="CharField" name="command">show_ind_id</field>
@@ -130,25 +130,19 @@
     <field type="CharField" name="command">view_evaluation_desc</field>
     <field type="CharField" name="url">evaluation_process</field>
     <field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
-    <field to="redirects.suffix" name="suffix" rel="ManyToOneRel">
-      <None/>
-    </field>
+    <field to="redirects.suffix" name="suffix" rel="ManyToOneRel"><None></None></field>
   </object>
   <object pk="8" model="redirects.command">
     <field type="CharField" name="command">view_key</field>
     <field type="CharField" name="url">ballot_key</field>
     <field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
-    <field to="redirects.suffix" name="suffix" rel="ManyToOneRel">
-      <None/>
-    </field>
+    <field to="redirects.suffix" name="suffix" rel="ManyToOneRel"><None></None></field>
   </object>
   <object pk="10" model="redirects.command">
     <field type="CharField" name="command">send_email</field>
     <field type="CharField" name="url">send_email</field>
     <field to="redirects.redirect" name="script" rel="ManyToOneRel">10</field>
-    <field to="redirects.suffix" name="suffix" rel="ManyToOneRel">
-      <None/>
-    </field>
+    <field to="redirects.suffix" name="suffix" rel="ManyToOneRel"><None></None></field>
   </object>
   <object pk="11" model="redirects.command">
     <field type="CharField" name="command">view_comment</field>
@@ -164,14 +158,14 @@
   </object>
   <object pk="2" model="redirects.suffix">
     <field type="CharField" name="rest">%(fl)s</field>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="3" model="redirects.suffix">
     <field type="CharField" name="rest">%(cat)s/%(sort)s</field>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="remove"></field>
   </object>
   <object pk="4" model="redirects.suffix">
     <field type="CharField" name="rest">%(id)s</field>
-    <field type="CharField" name="remove"/>
+    <field type="CharField" name="remove"></field>
   </object>
 </django-objects>