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

All tests pass on Python 2 and 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-11-20 14:01:48 -05:00
parent 53a6882f21
commit 5b87fb4afe
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,9 @@ class IntroducerClient(service.Service, Referenceable):
nickname, my_version, oldest_supported, nickname, my_version, oldest_supported,
app_versions, sequencer, cache_filepath): app_versions, sequencer, cache_filepath):
self._tub = tub self._tub = tub
if isinstance(introducer_furl, unicode):
introducer_furl = introducer_furl.encode("utf-8")
self.introducer_furl = introducer_furl self.introducer_furl = introducer_furl
assert isinstance(introducer_furl, (bytes, type(None)))
assert type(nickname) is unicode assert type(nickname) is unicode
self._nickname = nickname self._nickname = nickname

10
src/allmydata/introducer/server.py
View File

@ -1,5 +1,5 @@
from past.builtins import long from past.builtins import long
from six import ensure_str from six import ensure_str, ensure_text
import time, os.path, textwrap import time, os.path, textwrap
from zope.interface import implementer from zope.interface import implementer
@ -9,7 +9,7 @@ from twisted.python.failure import Failure
from foolscap.api import Referenceable from foolscap.api import Referenceable
import allmydata import allmydata
from allmydata import node from allmydata import node
from allmydata.util import log, rrefutil from allmydata.util import log, rrefutil, dictutil
from allmydata.util.i2p_provider import create as create_i2p_provider from allmydata.util.i2p_provider import create as create_i2p_provider
from allmydata.util.tor_provider import create as create_tor_provider from allmydata.util.tor_provider import create as create_tor_provider
from allmydata.introducer.interfaces import \ from allmydata.introducer.interfaces import \
@ -282,6 +282,9 @@ class IntroducerService(service.MultiService, Referenceable):
self.log("introducer: subscription[%s] request at %s" self.log("introducer: subscription[%s] request at %s"
% (service_name, subscriber), umid="U3uzLg") % (service_name, subscriber), umid="U3uzLg")
service_name = ensure_str(service_name) service_name = ensure_str(service_name)
subscriber_info = dictutil.UnicodeKeyDict({
ensure_text(k): v for (k, v) in subscriber_info.items()
})
return self.add_subscriber(subscriber, service_name, subscriber_info) return self.add_subscriber(subscriber, service_name, subscriber_info)
def add_subscriber(self, subscriber, service_name, subscriber_info): def add_subscriber(self, subscriber, service_name, subscriber_info):
@ -305,7 +308,8 @@ class IntroducerService(service.MultiService, Referenceable):
subscriber.notifyOnDisconnect(_remove) subscriber.notifyOnDisconnect(_remove)
# now tell them about any announcements they're interested in # now tell them about any announcements they're interested in
assert {type(service_name)} == set(type(k[0]) for k in self._announcements) assert {type(service_name)} >= set(type(k[0]) for k in self._announcements), (
service_name, self._announcements.keys())
announcements = set( [ ann_t announcements = set( [ ann_t
for idx,(ann_t,canary,ann,when) for idx,(ann_t,canary,ann,when)
in self._announcements.items() in self._announcements.items()