cli/pickle: Pass across tuples/lists consistently.

1 files changed, 4 insertions, 2 deletions

diff --git a/scripts/unpickle.py b/scripts/unpickle.py
index a561bf69..0249e4b7 100755
--- a/scripts/unpickle.py
+++ b/scripts/unpickle.py
@@ -125,10 +125,12 @@ class Dumper(Visitor):
             return repr(obj)
 
     def visitTuple(self, obj):
-        return '[' + ', '.join(itertools.imap(self.visit, obj)) + ']'
+        return '(' + ', '.join(itertools.imap(self.visit, obj)) + ')'
 
     def visitList(self, obj):
-        return '(' + ', '.join(itertools.imap(self.visit, obj)) + ')'
+        if len(obj) == 1:
+            return '&' + self.visit(obj[0])
+        return '{' + ', '.join(itertools.imap(self.visit, obj)) + '}'
 
     def visitByteArray(self, obj):
         return 'blob(%u)' % len(obj)