download: update all users to match Zooko's change to ICodecDecoder.decode (as it...

diff --git a/src/allmydata/download.py b/src/allmydata/download.py
index 5051a1e4e1ebb3608a95f7b0b19f611e9bdb0bd0..ef855d159a301bb5726e1aa83e39cf603342ab08 100644 (file)
--- a/src/allmydata/download.py
+++ b/src/allmydata/download.py
@@ -127,7 +127,8 @@ class FileDownloader:
 
         d.addCallback(lambda res: self._decoder.decode(shares))
 
-        def _write(data):
+        def _write(decoded_shares):
+            data = "".join(decoded_shares)
             self._target.open()
             hasher = sha.new(netstring("allmydata_v1_verifierid"))
             hasher.update(data)

diff --git a/src/allmydata/test/test_codec.py b/src/allmydata/test/test_codec.py
index d073ae8c113aa8d281a414d9bd5e73076d4e9f39..f7e84cefab7bd1bcff36585e017d57158be835e4 100644 (file)
--- a/src/allmydata/test/test_codec.py
+++ b/src/allmydata/test/test_codec.py
@@ -34,7 +34,8 @@ class Tester:
             d1 = dec.decode(shares)
             return d1
 
-        def _check_data(data1):
+        def _check_data(decoded_shares):
+            data1 = "".join(decoded_shares)
             self.failUnlessEqual(len(data1), len(data0))
             self.failUnless(data1 == data0)