From 51608285d0fde6c6b4555d17c152830053804097 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 2 Jun 2008 04:39:16 -0400 Subject: [PATCH] TURBOYAML!!1 svn path=/trunk/packages/sipb-xen-remote-server/; revision=563 --- files/usr/sbin/sipb-xen-remote-listvms | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/sipb-xen-remote-listvms index e3dfb94..55f8fd9 100755 --- a/files/usr/sbin/sipb-xen-remote-listvms +++ b/files/usr/sbin/sipb-xen-remote-listvms @@ -5,7 +5,6 @@ Collates the results of listvms from multiple VM servers. Part of the xvm suite. """ -from itertools import chain from subprocess import PIPE, Popen try: from subprocess import CalledProcessError @@ -20,8 +19,8 @@ except ImportError: self.cmd = cmd def __str__(self): return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) -from sys import argv, stdout -from yaml import safe_dump, safe_load +import sys +import yaml ### @@ -37,16 +36,16 @@ def main(argv): for p in pipes: if p.returncode != 0: raise CalledProcessError(p.returncode, cmd) - results = [safe_load(o) for o in outputs] + results = [yaml.load(o, yaml.CSafeLoader) for o in outputs] results = filter(lambda x: x is not None, results) # Merge the results and print. merged = {} for result in results: merged.update(result) - print safe_dump(merged, default_flow_style=False) + print yaml.dump(merged, Dumper=yaml.CDumper, default_flow_style=False) if __name__ == '__main__': - main(argv) + main(sys.argv) # vim:et:sw=2:ts=4 -- 1.7.9.5