.

wcfs/internal/xbtree.py

@@ -368,10 +368,10 @@ def Restructure(ztree, newStructure):
     for rnodev in rlevelv:
         for rn in rnodev:
             node = rn.node
-            assert isinstance(node, Tree), node # buckets were filtered out to rbucketv
-            znode = node.Z
+            assert isinstance(node, (Tree,Bucket))
 
             # https://github.com/zopefoundation/BTrees/blob/4.5.0-1-gc8bf24e/BTrees/BTreeTemplate.c#L1087
+            if isinstance(node, Tree):
                 zstate = unset = object()
                 if len(node.keyv) == 0:
                     child = node.children[0]
@@ -396,13 +396,8 @@ def Restructure(ztree, newStructure):
                     # firstbucket
                     zstate += (None,)   # XXX
 
-            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
+            if isinstance(node, Bucket):
                 zstate = ()
                 for k in node.keyv:
                     zstate += (k, kv.pop(k))            # (k1, v1, k2, v2, ..., kN, vN)