From: M A Young <m.a.young@durham.ac.uk>
Date: Fri, 17 Aug 2012 13:10:26 +0000 (+0100)
Subject: xend: Replace the use of XMLPrettyPrint from PyXML with stdlib functionality.
X-Git-Tag: 4.2.0-rc3~14
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ae10d8e67da181dce7a6fac33f0c49fd87806b98;p=people%2Fdwmw2%2Fxen.git

xend: Replace the use of XMLPrettyPrint from PyXML with stdlib functionality.

This appears to have been missed by changeset 22235:b8cc53d22545
"Replace pyxml/xmlproc-based XML validator with lxml based one"

This was reported by Toshio Ernie Kuratomi at
https://bugzilla.redhat.com/show_bug.cgi?id=842843

Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 5b52e3a706..7bad910941 100644
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -1543,8 +1543,7 @@ def main(argv):
             SXPPrettyPrint.prettyprint(config)
 
         if opts.vals.xmldryrun and serverType == SERVER_XEN_API:
-            from xml.dom.ext import PrettyPrint as XMLPrettyPrint
-            XMLPrettyPrint(doc)
+            print doc.toprettyxml()
 
     if opts.vals.dryrun or opts.vals.xmldryrun:
         return