Switch to decode_furl().

This commit is contained in:
Itamar Turner-Trauring 2021-04-02 12:49:01 -04:00
parent 939f1f840b
commit dd6e0d5467

View File

@ -12,7 +12,7 @@ if PY2:
import re
from foolscap.api import SturdyRef
from foolscap.furl import decode_furl
from allmydata.crypto.util import remove_prefix
from allmydata.crypto import ed25519
from allmydata.util import base32, jsonbytes as json
@ -125,10 +125,10 @@ class AnnouncementDescriptor(object):
self.service_name = ann_d["service-name"]
self.version = ann_d.get("my-version", "")
self.nickname = ann_d.get("nickname", u"")
(service_name, key_s) = index
(_, key_s) = index
self.serverid = key_s
furl = ann_d.get("anonymous-storage-FURL")
if furl:
self.connection_hints = list(SturdyRef(furl).locationHints)
_, self.connection_hints, _ = decode_furl(furl)
else:
self.connection_hints = []