Index: /trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms
===================================================================
--- /trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms	(revision 562)
+++ /trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms	(revision 563)
@@ -44,3 +44,3 @@
     else:
         import yaml
-        print yaml.safe_dump(vms, default_flow_style=False)
+        print yaml.dump(vms, Dumper=yaml.CDumper, default_flow_style=False)
Index: /trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms
===================================================================
--- /trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms	(revision 562)
+++ /trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-listvms	(revision 563)
@@ -6,5 +6,4 @@
 """
 
-from itertools import chain
 from subprocess import PIPE, Popen
 try:
@@ -21,6 +20,6 @@
         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
 
 ###
@@ -38,5 +37,5 @@
         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)
 
@@ -45,8 +44,8 @@
     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
Index: /trunk/packages/sipb-xen-www/code/controls.py
===================================================================
--- /trunk/packages/sipb-xen-www/code/controls.py	(revision 562)
+++ /trunk/packages/sipb-xen-www/code/controls.py	(revision 563)
@@ -141,5 +141,5 @@
     """Return a dictionary mapping machine names to dicts."""
     value_string = remctl('web', 'listvms')
-    value_dict = yaml.safe_load(value_string)
+    value_dict = yaml.load(value_string, yaml.CSafeLoader)
     return value_dict