bin/tahoe: clean up global-vs-subcommand arguments like --node-directory

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / scripts / admin.py

diff --git a/src/allmydata/scripts/admin.py b/src/allmydata/scripts/admin.py
index 581224d69c93165348279f2083002cee7d78304f..1a6c9854f93ed32161d95b1ee7db47c618d7bc95 100644 (file)
--- a/src/allmydata/scripts/admin.py
+++ b/src/allmydata/scripts/admin.py
@@ -1,12 +1,13 @@
 
 from twisted.python import usage
+from allmydata.scripts.common import BaseOptions
 
-class GenerateKeypairOptions(usage.Options):
+class GenerateKeypairOptions(BaseOptions):
     def getSynopsis(self):
         return "Usage: tahoe admin generate-keypair"
 
     def getUsage(self, width=None):
-        t = usage.Options.getUsage(self, width)
+        t = BaseOptions.getUsage(self, width)
         t += """
 Generate a public/private keypair, dumped to stdout as two lines of ASCII..
 
@@ -20,7 +21,7 @@ def print_keypair(options):
     print >>out, "private:", privkey_vs
     print >>out, "public:", pubkey_vs
 
-class DerivePubkeyOptions(usage.Options):
+class DerivePubkeyOptions(BaseOptions):
     def parseArgs(self, privkey):
         self.privkey = privkey
 
@@ -28,7 +29,7 @@ class DerivePubkeyOptions(usage.Options):
         return "Usage: tahoe admin derive-pubkey PRIVKEY"
 
     def getUsage(self, width=None):
-        t = usage.Options.getUsage(self, width)
+        t = BaseOptions.getUsage(self, width)
         t += """
 Given a private (signing) key that was previously generated with
 generate-keypair, derive the public key and print it to stdout.
@@ -45,7 +46,7 @@ def derive_pubkey(options):
     print >>out, "public:", pubkey_vs
     return 0
 
-class AdminCommand(usage.Options):
+class AdminCommand(BaseOptions):
     subCommands = [
         ("generate-keypair", None, GenerateKeypairOptions,
          "Generate a public/private keypair, write to stdout."),
@@ -58,7 +59,7 @@ class AdminCommand(usage.Options):
     def getSynopsis(self):
         return "Usage: tahoe admin SUBCOMMAND"
     def getUsage(self, width=None):
-        t = usage.Options.getUsage(self, width)
+        t = BaseOptions.getUsage(self, width)
         t += """
 Please run e.g. 'tahoe admin generate-keypair --help' for more details on
 each subcommand.