From 9bf221dea422b9850483f9853cd39c099cbdd9b5 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 11 Dec 2020 13:10:56 -0500 Subject: [PATCH] Match Foolscap better. --- src/allmydata/immutable/upload.py | 3 ++- src/allmydata/introducer/client.py | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py index 855f38919..6dae825ac 100644 --- a/src/allmydata/immutable/upload.py +++ b/src/allmydata/immutable/upload.py @@ -11,6 +11,7 @@ from future.utils import PY2, 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 from past.builtins import long, unicode +from six import ensure_str import os, time, weakref, itertools from zope.interface import implementer @@ -1825,7 +1826,7 @@ class Uploader(service.MultiService, log.PrefixingLogMixin): def startService(self): service.MultiService.startService(self) if self._helper_furl: - self.parent.tub.connectTo(self._helper_furl.encode("utf-8"), + self.parent.tub.connectTo(ensure_str(self._helper_furl), self._got_helper) def _got_helper(self, helper): diff --git a/src/allmydata/introducer/client.py b/src/allmydata/introducer/client.py index fa1e1efe8..584475524 100644 --- a/src/allmydata/introducer/client.py +++ b/src/allmydata/introducer/client.py @@ -11,7 +11,7 @@ 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 past.builtins import long -from six import ensure_text +from six import ensure_text, ensure_str import time from zope.interface import implementer @@ -39,8 +39,6 @@ class IntroducerClient(service.Service, Referenceable): nickname, my_version, oldest_supported, sequencer, cache_filepath): self._tub = tub - if isinstance(introducer_furl, str): - introducer_furl = introducer_furl.encode("utf-8") self.introducer_furl = introducer_furl assert isinstance(nickname, str) @@ -96,7 +94,7 @@ class IntroducerClient(service.Service, Referenceable): def startService(self): service.Service.startService(self) self._introducer_error = None - rc = self._tub.connectTo(self.introducer_furl, self._got_introducer) + rc = self._tub.connectTo(ensure_str(self.introducer_furl), self._got_introducer) self._introducer_reconnector = rc def connect_failed(failure): self.log("Initial Introducer connection failed: perhaps it's down",