From 011b027c392ea1b3c182e419b1db91922a4f9465 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 22 Jan 2021 10:14:28 -0500 Subject: [PATCH] More passing tests on Python 3. --- src/allmydata/test/common.py | 14 ++--- src/allmydata/test/web/test_web.py | 95 +++++++++++++++--------------- 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py index fde92fb59..f7f339b98 100644 --- a/src/allmydata/test/common.py +++ b/src/allmydata/test/common.py @@ -566,12 +566,12 @@ class FakeMutableFileNode(object): # type: ignore # incomplete implementation self.file_types[self.storage_index] = version initial_contents = self._get_initial_contents(contents) data = initial_contents.read(initial_contents.get_size()) - data = "".join(data) + data = b"".join(data) self.all_contents[self.storage_index] = data return defer.succeed(self) def _get_initial_contents(self, contents): if contents is None: - return MutableData("") + return MutableData(b"") if IMutableUploadable.providedBy(contents): return contents @@ -625,7 +625,7 @@ class FakeMutableFileNode(object): # type: ignore # incomplete implementation def raise_error(self): pass def get_writekey(self): - return "\x00"*16 + return b"\x00"*16 def get_size(self): return len(self.all_contents[self.storage_index]) def get_current_size(self): @@ -644,7 +644,7 @@ class FakeMutableFileNode(object): # type: ignore # incomplete implementation return self.file_types[self.storage_index] def check(self, monitor, verify=False, add_lease=False): - s = StubServer("\x00"*20) + s = StubServer(b"\x00"*20) r = CheckResults(self.my_uri, self.storage_index, healthy=True, recoverable=True, count_happiness=10, @@ -655,7 +655,7 @@ class FakeMutableFileNode(object): # type: ignore # incomplete implementation count_recoverable_versions=1, count_unrecoverable_versions=0, servers_responding=[s], - sharemap={"seq1-abcd-sh0": [s]}, + sharemap={b"seq1-abcd-sh0": [s]}, count_wrong_shares=0, list_corrupt_shares=[], count_corrupt_shares=0, @@ -709,7 +709,7 @@ class FakeMutableFileNode(object): # type: ignore # incomplete implementation def overwrite(self, new_contents): assert not self.is_readonly() new_data = new_contents.read(new_contents.get_size()) - new_data = "".join(new_data) + new_data = b"".join(new_data) self.all_contents[self.storage_index] = new_data return defer.succeed(None) def modify(self, modifier): @@ -740,7 +740,7 @@ class FakeMutableFileNode(object): # type: ignore # incomplete implementation def update(self, data, offset): assert not self.is_readonly() def modifier(old, servermap, first_time): - new = old[:offset] + "".join(data.read(data.get_size())) + new = old[:offset] + b"".join(data.read(data.get_size())) new += old[len(new):] return new return self.modify(modifier) diff --git a/src/allmydata/test/web/test_web.py b/src/allmydata/test/web/test_web.py index 244478a55..bcf4db1bf 100644 --- a/src/allmydata/test/web/test_web.py +++ b/src/allmydata/test/web/test_web.py @@ -1,8 +1,11 @@ from __future__ import print_function -import os.path, re, urllib, time +from past.builtins import unicode + +import os.path, re, time import json import treq +from urllib.parse import quote as urlquote, unquote as urlunquote from bs4 import BeautifulSoup @@ -115,8 +118,8 @@ class FakeUploader(service.Service): servermap={}, timings={}, uri_extension_data={}, - uri_extension_hash="fake", - verifycapstr="fakevcap") + uri_extension_hash=b"fake", + verifycapstr=b"fakevcap") ur.set_uri(n.get_uri()) return ur d.addCallback(_got_data) @@ -297,12 +300,12 @@ class FakeClient(_Client): # type: ignore # tahoe-lafs/ticket/3573 self.addService(FakeStorageServer(self.nodeid, self.nickname)) def get_long_nodeid(self): - return "v0-nodeid" + return b"v0-nodeid" def get_long_tubid(self): - return "tubid" + return u"tubid" def get_auth_token(self): - return 'a fake debug auth token' + return b'a fake debug auth token' def startService(self): return service.MultiService.startService(self) @@ -340,7 +343,7 @@ class WebMixin(TimezoneMixin): def _then(res): self.public_root = res[0][1] assert interfaces.IDirectoryNode.providedBy(self.public_root), res - self.public_url = "/uri/" + self.public_root.get_uri() + self.public_url = "/uri/" + unicode(self.public_root.get_uri(), "ascii") self.private_root = res[1][1] foo = res[2][1] @@ -365,7 +368,7 @@ class WebMixin(TimezoneMixin): # mdmf self.QUUX_CONTENTS, n, self._quux_txt_uri, self._quux_txt_readonly_uri = self.makefile_mutable(0, mdmf=True) - assert self._quux_txt_uri.startswith("URI:MDMF") + assert self._quux_txt_uri.startswith(b"URI:MDMF") foo.set_uri(u"quux.txt", self._quux_txt_uri, self._quux_txt_readonly_uri) foo.set_uri(u"empty", res[3][1].get_uri(), @@ -382,7 +385,7 @@ class WebMixin(TimezoneMixin): # filenode to test for html encoding issues self._htmlname_unicode = u"<&weirdly'named\"file>>>_