ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-14 14:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests pass on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-03-15 09:44:36 -04:00
parent 1c59d349ba
commit f147669071
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/scripts/tahoe_add_alias.py
View File

@ -5,7 +5,6 @@ from past.builtins import unicode
import os.path
import codecs
import json
from allmydata.util.assertutil import precondition
@ -14,6 +13,7 @@ from allmydata.scripts.common_http import do_http, check_http_error
from allmydata.scripts.common import get_aliases
from allmydata.util.fileutil import move_into_place
from allmydata.util.encodingutil import quote_output, quote_output_u
from allmydata.util import jsonbytes as json
def add_line_to_aliasfile(aliasfile, alias, cap):
@ -169,7 +169,10 @@ def list_aliases(options):
data = _get_alias_details(options['node-directory'])
if options['json']:
output = _escape_format(json.dumps(data, indent=4).decode("ascii"))
dumped = json.dumps(data, indent=4)
if isinstance(dumped, bytes):
loaded = dumped.decode("utf-8")
output = _escape_format(dumped)
else:
def dircap(details):
return (