mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-24 15:16:41 +00:00
handle foolscap's annoying tendency to turn everything into a sets.Set, which are not interoperable with 2.4's builtin 'set' type
This commit is contained in:
parent
7cd9ef3bbf
commit
466bb46abe
@ -198,6 +198,10 @@ class FileUploader:
|
|||||||
@type alreadygot: a set of sharenums
|
@type alreadygot: a set of sharenums
|
||||||
@type allocated: a set of sharenums
|
@type allocated: a set of sharenums
|
||||||
"""
|
"""
|
||||||
|
# TODO: some future version of Foolscap might not convert inbound
|
||||||
|
# sets into sets.Set on us, even when we're using 2.4
|
||||||
|
alreadygot = set(alreadygot)
|
||||||
|
allocated = set(allocated)
|
||||||
log.msg("%s._got_response(%s, %s, %s): self.unallocated_sharenums: %s, unhandled: %s" % (self, (alreadygot, allocated), peer, shares_we_requested, self.unallocated_sharenums, shares_we_requested - alreadygot - allocated))
|
log.msg("%s._got_response(%s, %s, %s): self.unallocated_sharenums: %s, unhandled: %s" % (self, (alreadygot, allocated), peer, shares_we_requested, self.unallocated_sharenums, shares_we_requested - alreadygot - allocated))
|
||||||
self.unallocated_sharenums -= alreadygot
|
self.unallocated_sharenums -= alreadygot
|
||||||
self.unallocated_sharenums -= allocated
|
self.unallocated_sharenums -= allocated
|
||||||
|
Loading…
Reference in New Issue
Block a user