cli/pickle: Pass structures as dictionaries.

1 files changed, 7 insertions, 1 deletions

diff --git a/scripts/unpickle.py b/scripts/unpickle.py
index 0249e4b7..5fe40f59 100755
--- a/scripts/unpickle.py
+++ b/scripts/unpickle.py
@@ -105,7 +105,7 @@ class Visitor:
         return self.visitIterable(obj)
 
     def visitDict(self, obj):
-        raise NotImplementedError
+        return self.visitIterable(obj)
 
     def visitByteArray(self, obj):
         raise NotImplementedError
@@ -132,6 +132,12 @@ class Dumper(Visitor):
             return '&' + self.visit(obj[0])
         return '{' + ', '.join(itertools.imap(self.visit, obj)) + '}'
 
+    def visitItems(self, items):
+        return ', '.join(['%s = %s' % (name, self.visit(value)) for name, value in items])
+
+    def visitDict(self, obj):
+        return '{' + self.visitItems(obj.iteritems()) + '}'
+
     def visitByteArray(self, obj):
         return 'blob(%u)' % len(obj)