ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-22 10:20:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match Foolscap better.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-12-11 13:10:56 -05:00
parent 42f2f2318c
commit 9bf221dea4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/immutable/upload.py
View File

@ -11,6 +11,7 @@ from future.utils import PY2, native_str
if 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 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 past.builtins import long, unicode
from six import ensure_str
import os, time, weakref, itertools import os, time, weakref, itertools
from zope.interface import implementer from zope.interface import implementer
@ -1825,7 +1826,7 @@ class Uploader(service.MultiService, log.PrefixingLogMixin):
def startService(self): def startService(self):
service.MultiService.startService(self) service.MultiService.startService(self)
if self._helper_furl: 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) self._got_helper)
def _got_helper(self, helper): def _got_helper(self, helper):

6
src/allmydata/introducer/client.py
View File

@ -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 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 past.builtins import long
from six import ensure_text from six import ensure_text, ensure_str
import time import time
from zope.interface import implementer from zope.interface import implementer
@ -39,8 +39,6 @@ class IntroducerClient(service.Service, Referenceable):
nickname, my_version, oldest_supported, nickname, my_version, oldest_supported,
sequencer, cache_filepath): sequencer, cache_filepath):
self._tub = tub self._tub = tub
if isinstance(introducer_furl, str):
introducer_furl = introducer_furl.encode("utf-8")
self.introducer_furl = introducer_furl self.introducer_furl = introducer_furl
assert isinstance(nickname, str) assert isinstance(nickname, str)
@ -96,7 +94,7 @@ class IntroducerClient(service.Service, Referenceable):
def startService(self): def startService(self):
service.Service.startService(self) service.Service.startService(self)
self._introducer_error = None 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 self._introducer_reconnector = rc
def connect_failed(failure): def connect_failed(failure):
self.log("Initial Introducer connection failed: perhaps it's down", self.log("Initial Introducer connection failed: perhaps it's down",