.

zodbtools/test/test_commit.py

@@ -58,7 +58,7 @@ def test_zodbcommit(zext):
     zodbdump(stor, p64(u64(head)+1), None, out=buf)
     dumped = buf.getvalue()
 
-    assert dumped == ''.join([_.zdump() for _ in (t1, t2)])
+    assert dumped == b''.join([_.zdump() for _ in (t1, t2)])
 
     # ObjectCopy. XXX zodbcommit handled ObjectCopy by actually copying data,
     # not referencing previous transaction via backpointer.

zodbtools/zodbdump.py

@@ -67,7 +67,7 @@ import sys
 import logging as log
 import re
 from golang.gcompat import qq
-from golang import func, defer, strconv
+from golang import func, defer, strconv, b
 
 # txn_raw_extension returns raw extension from txn metadata
 def txn_raw_extension(stor, txn):
@@ -96,11 +96,11 @@ def zodbdump(stor, tidmin, tidmax, hashonly=False, out=asbinstream(sys.stdout)):
     for txn in stor.iterator(tidmin, tidmax):
         # XXX .status not covered by IStorageTransactionInformation
         # XXX but covered by BaseStorage.TransactionRecord
-        out.write("txn %s %s\nuser %s\ndescription %s\nextension %s\n" % (
+        out.write(b("txn %s %s\nuser %s\ndescription %s\nextension %s\n" % (
             ashex(txn.tid), qq(txn.status),
             qq(txn.user),
             qq(txn.description),
-            qq(txn_raw_extension(stor, txn)) ))
+            qq(txn_raw_extension(stor, txn)) )))
 
         objv = txnobjv(txn)
 
@@ -120,18 +120,18 @@ def zodbdump(stor, tidmin, tidmax, hashonly=False, out=asbinstream(sys.stdout)):
                 entry += "%i sha1:%s" % (len(obj.data), ashex(sha1(obj.data)))
                 write_data = True
 
-            out.write(entry)
+            out.write(b(entry))
 
             if write_data:
                 if hashonly:
-                    out.write(" -")
+                    out.write(b" -")
                 else:
-                    out.write("\n")
+                    out.write(b"\n")
                     out.write(obj.data)
 
-            out.write("\n")
+            out.write(b"\n")
 
-        out.write("\n")
+        out.write(b"\n")
 
 # ----------------------------------------
 # XPickler is Pickler that tries to save objects stably
@@ -452,15 +452,15 @@ class Transaction(object):
     def _extension(self):
         return self.extension
 
-    # zdump returns text representation of a record in zodbdump format.
-    def zdump(self):
-        z  = 'txn %s %s\n' % (ashex(self.tid), qq(self.status))
-        z += 'user %s\n' % qq(self.user)
-        z += 'description %s\n' % qq(self.description)
-        z += 'extension %s\n' % qq(self.extension_bytes)
+    # zdump returns semi text-binary representation of a record in zodbdump format.
+    def zdump(self): # -> bytes
+        z  = b('txn %s %s\n' % (ashex(self.tid), qq(self.status)))
+        z += b('user %s\n' % qq(self.user))
+        z += b('description %s\n' % qq(self.description))
+        z += b('extension %s\n' % qq(self.extension_bytes))
         for obj in self.objv:
             z += obj.zdump()
-        z += '\n'
+        z += b'\n'
         return z
 
 
@@ -477,7 +477,7 @@ class ObjectDelete(Object):
         super(ObjectDelete, self).__init__(oid)
 
     def zdump(self):
-        return 'obj %s delete\n' % (ashex(self.oid))
+        return b'obj %s delete\n' % (ashex(self.oid))
 
 # ObjectCopy represents object data copy.
 class ObjectCopy(Object):
@@ -487,7 +487,7 @@ class ObjectCopy(Object):
         self.copy_from = copy_from
 
     def zdump(self):
-        return 'obj %s from %s\n' % (ashex(self.oid), ashex(self.copy_from))
+        return b'obj %s from %s\n' % (ashex(self.oid), ashex(self.copy_from))
 
 # ObjectData represents record with object data.
 class ObjectData(Object):
@@ -507,13 +507,13 @@ class ObjectData(Object):
             size = data.size
         else:
             size = len(data)
-        z = 'obj %s %d %s:%s' % (ashex(self.oid), size, self.hashfunc, ashex(self.hash_))
+        z = b('obj %s %d %s:%s' % (ashex(self.oid), size, self.hashfunc, ashex(self.hash_)))
         if hashonly:
-            z += ' -'
+            z += b' -'
         else:
-            z += '\n'
+            z += b'\n'
             z += data
-        z += '\n'
+        z += b'\n'
         return z
 
 # HashOnly indicated that this ObjectData record contains only hash and does not contain object data.