ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-07 11:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Finish port to Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-08-31 13:20:57 -04:00
parent 1cfe58a52d
commit 3fa919834a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
newsfragments/3397.minor Normal file
View File

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

@ -1,4 +1,12 @@
from future.utils import native_str, PY3, bytes_to_native_str from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
from future.utils import native_str, PY2, PY3, bytes_to_native_str
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
import time import time
import os.path import os.path
@ -392,7 +400,7 @@ class Server(unittest.TestCase):
def test_remove_incoming(self): def test_remove_incoming(self):
ss = self.create("test_remove_incoming") ss = self.create("test_remove_incoming")
already, writers = self.allocate(ss, b"vid", range(3), 10) already, writers = self.allocate(ss, b"vid", list(range(3)), 10)
for i,wb in writers.items(): for i,wb in writers.items():
wb.remote_write(0, b"%10d" % i) wb.remote_write(0, b"%10d" % i)
wb.remote_close() wb.remote_close()
@ -563,7 +571,7 @@ class Server(unittest.TestCase):
# now there should be ALLOCATED=1001+12+72=1085 bytes allocated, and # now there should be ALLOCATED=1001+12+72=1085 bytes allocated, and
# 5000-1085=3915 free, therefore we can fit 39 100byte shares # 5000-1085=3915 free, therefore we can fit 39 100byte shares
already3, writers3 = self.allocate(ss, b"vid3", range(100), 100, canary) already3, writers3 = self.allocate(ss, b"vid3", list(range(100)), 100, canary)
self.failUnlessEqual(len(writers3), 39) self.failUnlessEqual(len(writers3), 39)
self.failUnlessEqual(len(ss._active_writers), 39) self.failUnlessEqual(len(ss._active_writers), 39)
@ -598,7 +606,7 @@ class Server(unittest.TestCase):
def test_leases(self): def test_leases(self):
ss = self.create("test_leases") ss = self.create("test_leases")
canary = FakeCanary() canary = FakeCanary()
sharenums = range(5) sharenums = list(range(5))
size = 100 size = 100
rs0,cs0 = (hashutil.tagged_hash(b"blah", b"%d" % next(self._lease_secret)), rs0,cs0 = (hashutil.tagged_hash(b"blah", b"%d" % next(self._lease_secret)),

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

@ -92,6 +92,7 @@ PORTED_TEST_MODULES = [
"allmydata.test.test_python3", "allmydata.test.test_python3",
"allmydata.test.test_spans", "allmydata.test.test_spans",
"allmydata.test.test_statistics", "allmydata.test.test_statistics",
"allmydata.test.test_storage",
"allmydata.test.test_storage_web", "allmydata.test.test_storage_web",
"allmydata.test.test_time_format", "allmydata.test.test_time_format",
"allmydata.test.test_uri", "allmydata.test.test_uri",