.

wcfs/internal/xbtree.py

@@ -219,7 +219,7 @@ def StructureOf(znode, onlyKeys=False):
     if ztype.is_ztree:
         kind, keys, children = zbcheck.crack_btree(znode, ztype.is_map)
         if kind == zbcheck.BTREE_EMPTY:
-            return Tree([], Bucket([], [] if (ztype.is_map or not onlyKeys) else None))
+            return Tree([], Bucket([], None if ((not ztype.is_map) or onlyKeys) else []))
 
         if kind == zbcheck.BTREE_ONE:
             b = znode._bucket_type()

wcfs/internal/xbtree_test.py

@@ -474,7 +474,7 @@ def test_restructure():
             newStructure = newtopo
         xbtree.Restructure(ztree, newStructure)
 
-        assert xbtree.StructureOf(ztree) == newStructure
+        assert xbtree.StructureOf(ztree, onlyKeys=True) == newStructure
 
         # verify iteration producess the same [] of (key, v)
         assert list(ztree.items()) == items