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

Pass tests on Python 2.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-08-26 14:18:03 -04:00
parent 7ad6c9269c
commit 7fa180176e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/allmydata/scripts/admin.py
View File

@ -10,7 +10,7 @@ from future.utils import PY2
if PY2: if PY2:
from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401 from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
from six import ensure_binary from six import ensure_binary, ensure_str
import json import json
try: try:
@ -100,7 +100,7 @@ class AddGridManagerCertOptions(BaseOptions):
"Must provide --filename option" "Must provide --filename option"
) )
if self['filename'] == '-': if self['filename'] == '-':
print("reading certificate from stdin", file=self.parent.parent.stderr) print(ensure_str("reading certificate from stdin"), file=self.parent.parent.stderr)
data = self.parent.parent.stdin.read() data = self.parent.parent.stdin.read()
if len(data) == 0: if len(data) == 0:
raise usage.UsageError( raise usage.UsageError(
@ -151,7 +151,7 @@ def add_grid_manager_cert(options):
options['name'], options['name'],
cert_path.path, cert_path.path,
) )
print(msg, file=options.parent.parent.stderr) print(ensure_str(msg), file=options.parent.parent.stderr)
return 1 return 1
config.set_config("storage", "grid_management", "True") config.set_config("storage", "grid_management", "True")
@ -162,7 +162,8 @@ def add_grid_manager_cert(options):
f.write(cert_bytes) f.write(cert_bytes)
cert_count = len(config.enumerate_section("grid_manager_certificates")) cert_count = len(config.enumerate_section("grid_manager_certificates"))
print("There are now {} certificates".format(cert_count), file=options.parent.parent.stderr) print(ensure_str("There are now {} certificates").format(cert_count),
file=options.parent.parent.stderr)
return 0 return 0