ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 13:07:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Port to Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-11-09 13:55:28 -05:00
parent 3d5d46fe7c
commit b2e72ef562
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/allmydata/test/mutable/test_roundtrip.py
View File

@ -1,4 +1,14 @@
"""
Ported to Python 3.
"""
from __future__ import print_function from __future__ import print_function
from __future__ import absolute_import
from __future__ import division
from __future__ import unicode_literals
from future.utils import PY2
if PY2:
from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
from six.moves import cStringIO as StringIO from six.moves import cStringIO as StringIO
from twisted.trial import unittest from twisted.trial import unittest
@ -35,7 +45,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin, PublishMixin):
def abbrev_verinfo_dict(self, verinfo_d): def abbrev_verinfo_dict(self, verinfo_d):
output = {} output = {}
for verinfo,value in verinfo_d.items(): for verinfo,value in list(verinfo_d.items()):
(seqnum, root_hash, IV, segsize, datalength, k, N, prefix, (seqnum, root_hash, IV, segsize, datalength, k, N, prefix,
offsets_tuple) = verinfo offsets_tuple) = verinfo
output["%d-%s" % (seqnum, base32.b2a(root_hash)[:4])] = value output["%d-%s" % (seqnum, base32.b2a(root_hash)[:4])] = value
@ -54,7 +64,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin, PublishMixin):
r = Retrieve(self._fn, self._storage_broker, servermap, version) r = Retrieve(self._fn, self._storage_broker, servermap, version)
c = consumer.MemoryConsumer() c = consumer.MemoryConsumer()
d = r.download(consumer=c) d = r.download(consumer=c)
d.addCallback(lambda mc: "".join(mc.chunks)) d.addCallback(lambda mc: b"".join(mc.chunks))
return d return d
@ -88,7 +98,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin, PublishMixin):
def test_all_shares_vanished(self): def test_all_shares_vanished(self):
d = self.make_servermap() d = self.make_servermap()
def _remove_shares(servermap): def _remove_shares(servermap):
for shares in self._storage._peers.values(): for shares in list(self._storage._peers.values()):
shares.clear() shares.clear()
d1 = self.shouldFail(NotEnoughSharesError, d1 = self.shouldFail(NotEnoughSharesError,
"test_all_shares_vanished", "test_all_shares_vanished",
@ -103,7 +113,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin, PublishMixin):
d = self.make_servermap() d = self.make_servermap()
def _remove_shares(servermap): def _remove_shares(servermap):
self._version = servermap.best_recoverable_version() self._version = servermap.best_recoverable_version()
for shares in self._storage._peers.values()[2:]: for shares in list(self._storage._peers.values())[2:]:
shares.clear() shares.clear()
return self.make_servermap(servermap) return self.make_servermap(servermap)
d.addCallback(_remove_shares) d.addCallback(_remove_shares)
@ -317,7 +327,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin, PublishMixin):
N = self._fn.get_total_shares() N = self._fn.get_total_shares()
d = defer.succeed(None) d = defer.succeed(None)
d.addCallback(corrupt, self._storage, "pubkey", d.addCallback(corrupt, self._storage, "pubkey",
shnums_to_corrupt=range(0, N-k)) shnums_to_corrupt=list(range(0, N-k)))
d.addCallback(lambda res: self.make_servermap()) d.addCallback(lambda res: self.make_servermap())
def _do_retrieve(servermap): def _do_retrieve(servermap):
self.failUnless(servermap.get_problems()) self.failUnless(servermap.get_problems())
@ -328,7 +338,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin, PublishMixin):
c = consumer.MemoryConsumer() c = consumer.MemoryConsumer()
return r.download(c) return r.download(c)
d.addCallback(_do_retrieve) d.addCallback(_do_retrieve)
d.addCallback(lambda mc: "".join(mc.chunks)) d.addCallback(lambda mc: b"".join(mc.chunks))
d.addCallback(lambda new_contents: d.addCallback(lambda new_contents:
self.failUnlessEqual(new_contents, self.CONTENTS)) self.failUnlessEqual(new_contents, self.CONTENTS))
return d return d
@ -340,7 +350,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin, PublishMixin):
else: else:
d = defer.succeed(None) d = defer.succeed(None)
d.addCallback(lambda ignored: d.addCallback(lambda ignored:
corrupt(None, self._storage, offset, range(5))) corrupt(None, self._storage, offset, list(range(5))))
d.addCallback(lambda ignored: d.addCallback(lambda ignored:
self.make_servermap()) self.make_servermap())
def _do_retrieve(servermap): def _do_retrieve(servermap):

1
src/allmydata/util/_python3.py
View File

@ -106,6 +106,7 @@ PORTED_TEST_MODULES = [
"allmydata.test.mutable.test_multiple_versions", "allmydata.test.mutable.test_multiple_versions",
"allmydata.test.mutable.test_problems", "allmydata.test.mutable.test_problems",
"allmydata.test.mutable.test_repair", "allmydata.test.mutable.test_repair",
"allmydata.test.mutable.test_roundtrip",
"allmydata.test.test_abbreviate", "allmydata.test.test_abbreviate",
"allmydata.test.test_base32", "allmydata.test.test_base32",
"allmydata.test.test_base62", "allmydata.test.test_base62",