From dd6e0d546718a27d0ea4ff9fe03c59109113caf2 Mon Sep 17 00:00:00 2001 From: Itamar Turner-Trauring Date: Fri, 2 Apr 2021 12:49:01 -0400 Subject: [PATCH] Switch to decode_furl(). --- src/allmydata/introducer/common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/allmydata/introducer/common.py b/src/allmydata/introducer/common.py index dd9bb527c..f6f70d861 100644 --- a/src/allmydata/introducer/common.py +++ b/src/allmydata/introducer/common.py @@ -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 = []