]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
control.py: unbreak speed-test: overwrite() wants a MutableData, not str
authorBrian Warner <warner@lothar.com>
Fri, 23 Sep 2011 07:37:48 +0000 (00:37 -0700)
committerBrian Warner <warner@lothar.com>
Fri, 23 Sep 2011 07:37:48 +0000 (00:37 -0700)
Really, all the upload/modify APIs should take a string or a filehandle, and
internally wrap it as needed. Callers should not need to be aware of
Uploadable() or MutableData() classes.

src/allmydata/control.py

index f2f155059d09e891a7cae2ce150108bfe3a8248a..fcde8fabaa0620092fd1bd87f71e3074a10451d0 100644 (file)
@@ -8,6 +8,7 @@ from foolscap.api import Referenceable
 from allmydata.interfaces import RIControlClient, IFileNode
 from allmydata.util import fileutil, mathutil
 from allmydata.immutable import upload
+from allmydata.mutable.publish import MutableData
 from twisted.python import log
 
 def get_memory_usage():
@@ -180,7 +181,7 @@ class SpeedTest:
                 d1.addCallback(lambda n: n.get_uri())
             elif self.mutable_mode == "upload":
                 data = open(fn,"rb").read()
-                d1 = self._n.overwrite(data)
+                d1 = self._n.overwrite(MutableData(data))
                 d1.addCallback(lambda res: self._n.get_uri())
             else:
                 up = upload.FileName(fn, convergence=None)