.

wcfs/internal/xbtree.py

@@ -292,22 +292,12 @@ def Restructure(ztree, newStructure):
 
 
     # set znode states according to established tnew->znode association
-    for nodev in levelv:
-        for node in nodev:
+    for rnodev in rlevelv:
+        for rn in rnodev:
+            node = rn.node
+            assert isinstance(node, Tree)   # buckets were filtered out to rbucketv
             znode = node.Z
 
-            if isinstance(node, Bucket):
-                # https://github.com/zopefoundation/BTrees/blob/4.5.0-1-gc8bf24e/BTrees/BucketTemplate.c#L1195
-                zstate = ()
-                for k in node.keyv:
-                    zstate += (k, kv.pop(k))            # (k1, v1, k2, v2, ..., kN, vN)
-                zstate = (zstate,)
-
-                if node.next_bucket is not None:        # next
-                    zstate += (node.next_bucket.Z,)
-
-            else:
-                assert isinstance(node, Tree)
             # https://github.com/zopefoundation/BTrees/blob/4.5.0-1-gc8bf24e/BTrees/BTreeTemplate.c#L1087
             if len(node.keyv) == 0:
                 panic("TODO: empty tree + tree with bucket without oid")
@@ -324,6 +314,21 @@ def Restructure(ztree, newStructure):
 
             znode.__setstate__(zstate)
 
+    # ----//---- for buckets
+    for rbucket in rbucketv:
+        node = rbucket.node
+
+        # https://github.com/zopefoundation/BTrees/blob/4.5.0-1-gc8bf24e/BTrees/BucketTemplate.c#L1195
+        zstate = ()
+        for k in node.keyv:
+            zstate += (k, kv.pop(k))            # (k1, v1, k2, v2, ..., kN, vN)
+        zstate = (zstate,)
+
+        if node.next_bucket is not None:        # next
+            zstate += (node.next_bucket.Z,)
+
+        node.Z.__setstate__(zstate)
+
 
     assert tnew.Z is ztree
     assert len(kv) == 0     # all keys must have been popped