tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

control.py: unbreak speed-test: overwrite() wants a MutableData, not str 

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.
This commit is contained in:
Brian Warner 2011-09-23 00:37:48 -07:00
parent 5d3d0dc336
commit f61bdbffd7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/control.py
View File

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