.

wcfs/zblk.go

@@ -142,7 +142,7 @@ type ZBlk0 struct {
 	zblkInΔFtail
 	zodb.Persistent
 
-	// XXX py source uses bytes(buf) but on python2 it still results in str
+	// NOTE py source uses bytes(buf) but on python2 it still results in str
 	blkdata string
 }
 
@@ -162,15 +162,14 @@ func (zb *zBlk0State) PySetState(pystate interface{}) error {
 		return fmt.Errorf("expect str; got %s", typeOf(pystate))
 	}
 
-	//log.Printf("ZBlk0.PySetState #%d", len(blkdata))
 	zb.blkdata = blkdata
 	return nil
 }
 
-func (zb *ZBlk0) loadBlkData(ctx context.Context) ([]byte, zodb.Tid, error) {
-	// XXX err ctx
+func (zb *ZBlk0) loadBlkData(ctx context.Context) (_ []byte, _ zodb.Tid, err error) {
+	defer xerr.Contextf(&err, "ZBlk0(%s): loadBlkData", zb.POid())
 
-	err := zb.PActivate(ctx)
+	err = zb.PActivate(ctx)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -239,10 +238,10 @@ func (zb *zBlk1State) PySetState(pystate interface{}) error {
 	return nil
 }
 
-func (zb *ZBlk1) loadBlkData(ctx context.Context) ([]byte, zodb.Tid, error) {
-	// XXX errctx
+func (zb *ZBlk1) loadBlkData(ctx context.Context) (_ []byte, _ zodb.Tid, err error) {
+	defer xerr.Contextf(&err, "ZBlk1(%s): loadBlkData", zb.POid())
 
-	err := zb.PActivate(ctx)
+	err = zb.PActivate(ctx)
 	if err != nil {
 		return nil, 0, err
 	}