From 0af033beb7453ef02c854e9a820e685c75ffe258 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Fri, 13 Nov 2020 22:57:26 -0700
Subject: [PATCH] use filepath

---
 src/allmydata/scripts/admin.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/allmydata/scripts/admin.py b/src/allmydata/scripts/admin.py
index b13dfb07d..2b896fcfb 100644
--- a/src/allmydata/scripts/admin.py
+++ b/src/allmydata/scripts/admin.py
@@ -2,10 +2,10 @@ from __future__ import print_function
 
 import sys
 import json
-from os.path import exists, join
 
 from twisted.python import usage
-#from allmydata.node import read_config
+from twisted.python.filepath import FilePath
+
 from allmydata.client import read_config
 from allmydata.grid_manager import (
     parse_grid_manager_certificate,
@@ -16,6 +16,7 @@ from allmydata.util.encodingutil import argv_to_abspath
 from allmydata.util import fileutil
 
 
+
 class GenerateKeypairOptions(BaseOptions):
 
     def getUsage(self, width=None):
@@ -80,7 +81,7 @@ class AddGridManagerCertOptions(BaseOptions):
             )
         if self['filename'] == '-':
             print("reading certificate from stdin", file=self.parent.parent.stderr)
-            data = sys.stdin.read()
+            data = self.parent.parent.stdin.read()
             if len(data) == 0:
                 raise usage.UsageError(
                     "Reading certificate from stdin failed"
@@ -124,11 +125,11 @@ def add_grid_manager_cert(options):
     config = read_config(nd, "portnum")
     config_path = join(nd, "tahoe.cfg")
     cert_fname = "{}.cert".format(options['name'])
-    cert_path = config.get_config_path(cert_fname)
+    cert_path = FilePath(config.get_config_path(cert_fname))
     cert_bytes = json.dumps(options.certificate_data, indent=4) + '\n'
     cert_name = options['name']
 
-    if exists(cert_path):
+    if cert_path.exists():
         msg = "Already have certificate for '{}' (at {})".format(
             options['name'],
             cert_path,
@@ -140,11 +141,8 @@ def add_grid_manager_cert(options):
     config.set_config("grid_manager_certificates", cert_name, cert_fname)
 
     # write all the data out
-
-    fileutil.write(cert_path, cert_bytes)
-    with open(config_path, "w") as f:
-        # XXX probably want a _Config.write_tahoe_cfg() or something?
-        config.config.write(f)
+    with cert_path.open("wb") as f:
+        f.wrwite(cert_bytes)
 
     cert_count = len(config.enumerate_section("grid_manager_certificates"))
     print("There are now {} certificates".format(cert_count), file=options.parent.parent.stderr)