Changeset 550 for trunk/packages/sipb-xen-www/code

Timestamp:

Jun 1, 2008, 6:49:03 PM (16 years ago)

Author:

broder

Message:

Switch to using YAML on the web interface for listvms

File:

• trunk/packages/sipb-xen-www/code/controls.py (modified) (2 diffs)

trunk/packages/sipb-xen-www/code/controls.py

@@ -12 +12 @@
 import re
 import cache_acls
-import cPickle
+import yaml
 
 # ... and stolen from xend/uuid.py
@@ -140 +140 @@
 def getList(machines):
     """Return a dictionary mapping machine  to dicts."""
-    value_string = remctl('web', 'listvms', '--pickle')
-    value_dict = cPickle.loads(value_string)
+    value_string = remctl('web', 'listvms')
+    value_dict = yaml.safe_load(value_string)
 
     d = dict((m, value_dict[m.name]) for m in machines if m.name in value_dict)