Rev4017, Fix Bigfile test, Python 3.4 compatibility

plugins/Bigfile/BigfilePlugin.py

@@ -264,7 +264,10 @@ class ContentManagerPlugin(object):
                 file_out.close()
 
         mt.make_tree()
-        return mt.get_merkle_root(), piece_size, {
+        merkle_root = mt.get_merkle_root()
+        if type(merkle_root) is bytes:  # Python <3.5
+            merkle_root = merkle_root.decode()
+        return merkle_root, piece_size, {
             "sha512_pieces": piece_hashes
         }
 

plugins/Bigfile/Test/TestBigfile.py

@@ -40,7 +40,7 @@ class TestBigfile:
         piecemap = Msgpack.unpack(site.storage.open(file_node["piecemap"], "rb").read())["optional.any.iso"]
         assert len(piecemap["sha512_pieces"]) == 10
         assert piecemap["sha512_pieces"][0] != piecemap["sha512_pieces"][1]
-        assert binascii.hexlify(piecemap["sha512_pieces"][0].encode()) == b"a73abad9992b3d0b672d0c2a292046695d31bebdcb1e150c8410bbe7c972eff3"
+        assert binascii.hexlify(piecemap["sha512_pieces"][0]) == b"a73abad9992b3d0b672d0c2a292046695d31bebdcb1e150c8410bbe7c972eff3"
 
     def testVerifyPiece(self, site):
         inner_path = self.createBigfile(site)

src/Config.py

@@ -13,7 +13,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.7.0"
-        self.rev = 4016
+        self.rev = 4017
         self.argv = argv
         self.action = None
         self.pending_changes = {}