immutable: tidy up the notification of waiters for ReadBucketProxy

This commit is contained in:
Zooko O'Whielacronx 2009-01-05 13:35:22 -07:00
parent 778167c2b1
commit 8a840469c3

View File

@ -289,7 +289,9 @@ class ReadBucketProxy:
d.addCallback(self._parse_sharehashtree_and_ueb)
def _fail_waiters(f):
self._ready.fire(f)
d.addErrback(_fail_waiters)
def _notify_waiters(result):
self._ready.fire(result)
d.addCallbacks(_notify_waiters, _fail_waiters)
return d
def _fetch_header(self):
@ -351,8 +353,6 @@ class ReadBucketProxy:
length = struct.unpack(self._fieldstruct, data[i:i+self._fieldsize])[0]
self._ueb_data = data[i+self._fieldsize:i+self._fieldsize+length]
self._ready.fire(self)
def _get_block_data(self, unused, blocknum, blocksize, thisblocksize):
offset = self._offsets['data'] + blocknum * blocksize
return self._read(offset, thisblocksize)