cli/pickle: Pass across tuples/lists consistently.

2 files changed, 6 insertions, 4 deletions

diff --git a/cli/cli_pickle.cpp b/cli/cli_pickle.cpp
index 6d368028..04aec1b2 100644
--- a/cli/cli_pickle.cpp
+++ b/cli/cli_pickle.cpp
@@ -98,7 +98,7 @@ public:
         if (symbolic) {
             unsigned long long value = node->value;
             const BitmaskSig *sig = node->sig;
-            writer.beginList();
+            writer.beginTuple();
             for (const BitmaskFlag *it = sig->flags; it != sig->flags + sig->num_flags; ++it) {
                 if ((it->value && (value & it->value) == it->value) ||
                     (!it->value && value == 0)) {
@@ -112,7 +112,7 @@ public:
             if (value) {
                 writer.writeInt(value);
             }
-            writer.endList();
+            writer.endTuple();
         } else {
             writer.writeInt(node->value);
         }
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)