.

wcfs/internal/xbtree.py

@@ -245,11 +245,24 @@ def Restructure(ztree, newStructure):
             panic("TODO")
         zrlevel = zrlevelv.pop(0)
 
-        # XXX filter-out buckets
-        _ = []
+        # filter-out buckets
+        _ = []  # zrlevel -> zrlevel, zrbucketv
         for zrn in zrlevel:
             assert isinstance(zrn.node, (ztreeType, zbucketType))
-            if isinstance(zrn.node, z
+            if isinstance(zrn.node, zbucketType):
+                zrbucketv.append(zrn)
+            else:
+                _.append(zrn)
+        zrlevel = _
+        _ = []  # rlevel  ->  rlevel,  rbucketv
+        for rn in rlevel:
+            assert isinstance(rn.node, (Tree, Bucket))
+            if isinstance(rn.node, Bucket):
+                rbucketv.append(rn)
+            else:
+                _.append(rn)
+        rlevel = _
+
 
         if len(zrlevel) == len(rlevel):   # map 1-1
             for (zrn, rn) in zip(zrlevel, rlevel):