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

json dumping doesn't like keys that are bytes (not sure how this ever worked)

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2023-11-15 12:15:06 -05:00
parent ffe0979ad5
commit def7014c79
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/client.py
View File

@ -12,6 +12,7 @@ from base64 import urlsafe_b64encode
from functools import partial from functools import partial
from configparser import NoSectionError from configparser import NoSectionError
from six import ensure_text
from foolscap.furl import ( from foolscap.furl import (
decode_furl, decode_furl,
) )
@ -989,6 +990,9 @@ class _Client(node.Node, pollmixin.PollMixin):
static_servers = servers_yaml.get("storage", {}) static_servers = servers_yaml.get("storage", {})
log.msg("found %d static servers in private/servers.yaml" % log.msg("found %d static servers in private/servers.yaml" %
len(static_servers)) len(static_servers))
static_servers = {
ensure_text(key): value for (key, value) in static_servers.items()
}
self.storage_broker.set_static_servers(static_servers) self.storage_broker.set_static_servers(static_servers)
except EnvironmentError: except EnvironmentError:
pass pass

1
src/allmydata/storage_client.py
View File

@ -273,7 +273,6 @@ class StorageFarmBroker(service.MultiService):
# doesn't really matter but it makes the logging behavior more # doesn't really matter but it makes the logging behavior more
# predictable and easier to test (and at least one test does depend on # predictable and easier to test (and at least one test does depend on
# this sorted order). # this sorted order).
servers = {ensure_text(key): value for (key, value) in servers.items()}
for (server_id, server) in sorted(servers.items()): for (server_id, server) in sorted(servers.items()):
try: try:
storage_server = self._make_storage_server( storage_server = self._make_storage_server(