ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-22 00:41:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed tuple unpacking in function definitons for python3 compatibility

Browse Source
This commit is contained in:
heartsucker
2019-04-12 16:18:36 +02:00
parent 0e7f271494
commit a087a5be72
34 changed files with 602 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/allmydata/test/test_storage.py
View File

@ -1620,7 +1620,8 @@ class MDMFProxies(unittest.TestCase, ShouldFailMixin):
mr = MDMFSlotReadProxy(self.rref, "si1", 0)
# Check that every method equals what we expect it to.
d = defer.succeed(None)
def _check_block_and_salt((block, salt)):
def _check_block_and_salt(block_and_salt):
(block, salt) = block_and_salt
self.failUnlessEqual(block, self.block)
self.failUnlessEqual(salt, self.salt)
@ -1671,7 +1672,8 @@ class MDMFProxies(unittest.TestCase, ShouldFailMixin):
d.addCallback(lambda ignored:
mr.get_encoding_parameters())
def _check_encoding_parameters((k, n, segsize, datalen)):
def _check_encoding_parameters(args):
(k, n, segsize, datalen) = args
self.failUnlessEqual(k, 3)
self.failUnlessEqual(n, 10)
self.failUnlessEqual(segsize, 6)
@ -1712,7 +1714,8 @@ class MDMFProxies(unittest.TestCase, ShouldFailMixin):
self.write_test_share_to_server("si1")
mr = MDMFSlotReadProxy(self.rref, "si1", 0)
d = mr.get_encoding_parameters()
def _check_encoding_parameters((k, n, segment_size, datalen)):
def _check_encoding_parameters(args):
(k, n, segment_size, datalen) = args
self.failUnlessEqual(k, 3)
self.failUnlessEqual(n, 10)
self.failUnlessEqual(segment_size, 6)
@ -2260,7 +2263,8 @@ class MDMFProxies(unittest.TestCase, ShouldFailMixin):
mw.finish_publishing())
mr = MDMFSlotReadProxy(self.rref, "si1", 0)
def _check_block_and_salt((block, salt)):
def _check_block_and_salt(block_and_salt):
(block, salt) = block_and_salt
self.failUnlessEqual(block, self.block)
self.failUnlessEqual(salt, self.salt)
@ -2306,7 +2310,8 @@ class MDMFProxies(unittest.TestCase, ShouldFailMixin):
d.addCallback(lambda ignored:
mr.get_encoding_parameters())
def _check_encoding_parameters((k, n, segsize, datalen)):
def _check_encoding_parameters(args):
(k, n, segsize, datalen) = args
self.failUnlessEqual(k, 3)
self.failUnlessEqual(n, 10)
self.failUnlessEqual(segsize, 6)
@ -2473,7 +2478,8 @@ class MDMFProxies(unittest.TestCase, ShouldFailMixin):
d.addCallback(_make_mr, 123)
d.addCallback(lambda mr:
mr.get_block_and_salt(0))
def _check_block_and_salt((block, salt)):
def _check_block_and_salt(block_and_salt):
(block, salt) = block_and_salt
self.failUnlessEqual(block, self.block)
self.failUnlessEqual(salt, self.salt)
self.failUnlessEqual(self.rref.read_count, 1)
@ -2534,7 +2540,8 @@ class MDMFProxies(unittest.TestCase, ShouldFailMixin):
d.addCallback(_make_mr, 123)
d.addCallback(lambda mr:
mr.get_block_and_salt(0))
def _check_block_and_salt((block, salt)):
def _check_block_and_salt(block_and_salt):
(block, salt) = block_and_salt
self.failUnlessEqual(block, self.block * 6)
self.failUnlessEqual(salt, self.salt)
# TODO: Fix the read routine so that it reads only the data