From 6fc44f7a316894f6b5a0b3160c5bd7fe03231c2e Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Mon, 1 Mar 2021 10:53:25 -0500 Subject: [PATCH] get_name() should always return bytes, apparently. --- src/allmydata/immutable/downloader/share.py | 2 +- src/allmydata/test/no_network.py | 3 ++- src/allmydata/test/web/test_grid.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/allmydata/immutable/downloader/share.py b/src/allmydata/immutable/downloader/share.py index 48cc26b6f..86b99e99c 100644 --- a/src/allmydata/immutable/downloader/share.py +++ b/src/allmydata/immutable/downloader/share.py @@ -108,7 +108,7 @@ class Share(object): self.had_corruption = False # for unit tests def __repr__(self): - return "Share(sh%d-on-%r)" % (self._shnum, self._server.get_name()) + return "Share(sh%d-on-%s)" % (self._shnum, str(self._server.get_name(), "utf-8")) def is_alive(self): # XXX: reconsider. If the share sees a single error, should it remain diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py index cbea0dfcd..2f75f9274 100644 --- a/src/allmydata/test/no_network.py +++ b/src/allmydata/test/no_network.py @@ -200,7 +200,8 @@ class NoNetworkServer(object): return self.serverid def get_name(self): - return idlib.shortnodeid_b2a(self.serverid) + # Other implementations return bytes. + return idlib.shortnodeid_b2a(self.serverid).encode("utf-8") def get_longname(self): return idlib.nodeid_b2a(self.serverid) def get_nickname(self): diff --git a/src/allmydata/test/web/test_grid.py b/src/allmydata/test/web/test_grid.py index 2430c2930..ef2718df4 100644 --- a/src/allmydata/test/web/test_grid.py +++ b/src/allmydata/test/web/test_grid.py @@ -1144,7 +1144,7 @@ class Grid(GridTestMixin, WebErrorMixin, ShouldFailMixin, testutil.ReallyEqualMi " overdue= unused= need 3. Last failure: None") msg2 = msgbase + (" ran out of shares:" " complete=" - " pending=Share(sh0-on-'ysbz4st7')" + " pending=Share(sh0-on-ysbz4st7)" " overdue= unused= need 3. Last failure: None") self.failUnless(body == msg1 or body == msg2, body) d.addCallback(_check_one_share)