options: remove unused 'exe' parameter

The 'exe' parameter was added in the hope of using it for additional
contextual information in the help text that Options generates. It was
till then abandoned and was judged as superflous information.

Remove the 'exe' parameter from Options' constructor.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>

diff --git a/cmd/damage-cmd.py b/cmd/damage-cmd.py
index 6f630fd130ca3e4f9318b7e4ad90b0e61004c430..49dbed07146cac337498de6c960044024af26e76 100755 (executable)
--- a/cmd/damage-cmd.py
+++ b/cmd/damage-cmd.py
@@ -21,7 +21,7 @@ percent= maximum size of each damaged block (as a percent of entire file)
 equal    spread damage evenly throughout the file
 S,seed=  random number seed (for repeatable tests)
 """
-o = options.Options('bup damage', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if not extra:

diff --git a/cmd/drecurse-cmd.py b/cmd/drecurse-cmd.py
index 41503ee829a013bdb98e7ce51cdf9a77bef1e331..5be71b5d1fd82df72db1157ef8ec666417c948e4 100755 (executable)
--- a/cmd/drecurse-cmd.py
+++ b/cmd/drecurse-cmd.py
@@ -11,7 +11,7 @@ exclude-from= a file that contains exclude paths (can be used more than once)
 q,quiet  don't actually print filenames
 profile  run under the python profiler
 """
-o = options.Options('bup drecurse', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if len(extra) != 1:

diff --git a/cmd/fsck-cmd.py b/cmd/fsck-cmd.py
index 1c2505812d8c7a75981ff246519798d3439228ff..44decd894e7983d4f20438ec59ecef61f0c4cb54 100755 (executable)
--- a/cmd/fsck-cmd.py
+++ b/cmd/fsck-cmd.py
@@ -129,7 +129,7 @@ j,jobs=     run 'n' jobs in parallel
 par2-ok     immediately return 0 if par2 is ok, 1 if not
 disable-par2  ignore par2 even if it is available
 """
-o = options.Options('bup fsck', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 par2_setup()

diff --git a/cmd/ftp-cmd.py b/cmd/ftp-cmd.py
index 1edb5f521442d731f50a105100639b22249e37c2..d63a7106f55a8a8b75ecdcda869c27e0e9eef91b 100755 (executable)
--- a/cmd/ftp-cmd.py
+++ b/cmd/ftp-cmd.py
@@ -24,7 +24,7 @@ ls [-a] [path...]
 --
 a,all   include hidden files in the listing
 """
-ls_opt = options.Options('ls', ls_optspec, onabort=OptionError)
+ls_opt = options.Options(ls_optspec, onabort=OptionError)
 
 def do_ls(cmd_args):
     try:
@@ -151,7 +151,7 @@ def completer(text, state):
 optspec = """
 bup ftp [commands...]
 """
-o = options.Options('bup ftp', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 git.check_repo_or_die()

diff --git a/cmd/fuse-cmd.py b/cmd/fuse-cmd.py
index 450d366eb311ca2e9cf53b2627017892d429524b..9253a18de996efbea4f58b2125a851bcd1144232 100755 (executable)
--- a/cmd/fuse-cmd.py
+++ b/cmd/fuse-cmd.py
@@ -116,7 +116,7 @@ d,debug   increase debug level
 f,foreground  run in foreground
 o,allow-other allow other users to access the filesystem
 """
-o = options.Options('bup fuse', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if len(extra) != 1:

diff --git a/cmd/help-cmd.py b/cmd/help-cmd.py
index b22a68f62c828510f046ca91aef0483ba5ad2d22..c507a3775cf45ea31f4d953405db8742a84d345e 100755 (executable)
--- a/cmd/help-cmd.py
+++ b/cmd/help-cmd.py
@@ -5,7 +5,7 @@ from bup import options
 optspec = """
 bup help <command>
 """
-o = options.Options('bup help', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if len(extra) == 0:

diff --git a/cmd/index-cmd.py b/cmd/index-cmd.py
index 43314d960f5be025f89c10faa14eb2496bd262fb..0ff637ab97a809d4632148d732822f1518572f9b 100755 (executable)
--- a/cmd/index-cmd.py
+++ b/cmd/index-cmd.py
@@ -135,7 +135,7 @@ exclude=   a path to exclude from the backup (can be used more than once)
 exclude-from= a file that contains exclude paths (can be used more than once)
 v,verbose  increase log output (can be used more than once)
 """
-o = options.Options('bup index', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if not (opt.modified or opt['print'] or opt.status or opt.update or opt.check):

diff --git a/cmd/init-cmd.py b/cmd/init-cmd.py
index 80037e94e37645b836f7fddd1b6ea7eff62fee5c..2e4a1513b99c058a1fec43ba0e62091d3ed2158d 100755 (executable)
--- a/cmd/init-cmd.py
+++ b/cmd/init-cmd.py
@@ -10,7 +10,7 @@ optspec = """
 --
 r,remote=  remote repository path
 """
-o = options.Options('bup init', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if extra:

diff --git a/cmd/join-cmd.py b/cmd/join-cmd.py
index 81febac4b23c39b3cd3d973e93064eb9f477bd45..edc5fcb216338ecda6c1dcdc133c146f9fe97ec7 100755 (executable)
--- a/cmd/join-cmd.py
+++ b/cmd/join-cmd.py
@@ -9,7 +9,7 @@ bup join [-r host:path] [refs or hashes...]
 --
 r,remote=  remote repository path
 """
-o = options.Options('bup join', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 git.check_repo_or_die()

diff --git a/cmd/ls-cmd.py b/cmd/ls-cmd.py
index bbc0432987530946aefdb489b1c749e5b4ad8626..44359a3ec2ba275c00240deb805b55dfa49cd37e 100755 (executable)
--- a/cmd/ls-cmd.py
+++ b/cmd/ls-cmd.py
@@ -21,7 +21,7 @@ bup ls <dirs...>
 s,hash   show hash for each file
 a,all    show hidden files
 """
-o = options.Options('bup ls', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 git.check_repo_or_die()

diff --git a/cmd/margin-cmd.py b/cmd/margin-cmd.py
index 90dbdcd8f90edad112c48cc5d513b95554b709fe..9b7fd60a18efd24ab1801f32bcf02623be0cd3c1 100755 (executable)
--- a/cmd/margin-cmd.py
+++ b/cmd/margin-cmd.py
@@ -11,7 +11,7 @@ bup margin
 predict    Guess object offsets and report the maximum deviation
 ignore-midx  Don't use midx files; use only plain pack idx files.
 """
-o = options.Options('bup margin', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if extra:

diff --git a/cmd/memtest-cmd.py b/cmd/memtest-cmd.py
index fb202b749d65261ee0cf64d3b3d36e63c7f9c955..19c33931b6557c1a90010dda14cf5f294963f603 100755 (executable)
--- a/cmd/memtest-cmd.py
+++ b/cmd/memtest-cmd.py
@@ -60,7 +60,7 @@ c,cycles=  number of cycles to run [100]
 ignore-midx  ignore .midx files, use only .idx files
 existing   test with existing objects instead of fake ones
 """
-o = options.Options('bup memtest', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if extra:

diff --git a/cmd/midx-cmd.py b/cmd/midx-cmd.py
index 1ef09e047472f19f8929af1df0a51fbd87614450..8b2ea2b3dff9d5397fc4ac977fbb07a24bfd8218 100755 (executable)
--- a/cmd/midx-cmd.py
+++ b/cmd/midx-cmd.py
@@ -184,7 +184,7 @@ def do_midx_group(outdir, infiles):
 
 handle_ctrl_c()
 
-o = options.Options('bup midx', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if extra and (opt.auto or opt.force):

diff --git a/cmd/newliner-cmd.py b/cmd/newliner-cmd.py
index 6b505b4a992b97d913cb1679ba11b99a0a4f9065..2c86d5dfb255f85ddf34be21fe0e6f7919aedaf4 100755 (executable)
--- a/cmd/newliner-cmd.py
+++ b/cmd/newliner-cmd.py
@@ -5,7 +5,7 @@ from bup import options
 optspec = """
 bup newliner
 """
-o = options.Options('bup newliner', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if extra:

diff --git a/cmd/on--server-cmd.py b/cmd/on--server-cmd.py
index 3d2af568bc58335afdb88c99e50caec84c9f255b..327c81ffd8edc32cc945f7959de6b4cf45a04039 100755 (executable)
--- a/cmd/on--server-cmd.py
+++ b/cmd/on--server-cmd.py
@@ -7,7 +7,7 @@ bup on--server
 --
     This command is run automatically by 'bup on'
 """
-o = options.Options('bup server-reverse', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 if extra:
     o.fatal('no arguments expected')

diff --git a/cmd/on-cmd.py b/cmd/on-cmd.py
index c40a6e8de90ddb262153e4920e31bcbc8edf949f..e9a4a23887580b830d2600f93a8df03fec306ffd 100755 (executable)
--- a/cmd/on-cmd.py
+++ b/cmd/on-cmd.py
@@ -8,7 +8,7 @@ bup on <hostname> index ...
 bup on <hostname> save ...
 bup on <hostname> split ...
 """
-o = options.Options('bup on', optspec, optfunc=getopt.getopt)
+o = options.Options(optspec, optfunc=getopt.getopt)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 if len(extra) < 2:
     o.fatal('arguments expected')

diff --git a/cmd/random-cmd.py b/cmd/random-cmd.py
index 873b511f26428163d65f024fcd0666fca4d28395..4be366063c18c2792baab50fc55606d03703c795 100755 (executable)
--- a/cmd/random-cmd.py
+++ b/cmd/random-cmd.py
@@ -10,7 +10,7 @@ S,seed=   optional random number seed [1]
 f,force   print random data to stdout even if it's a tty
 v,verbose print byte counter to stderr
 """
-o = options.Options('bup random', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if len(extra) != 1:

diff --git a/cmd/restore-cmd.py b/cmd/restore-cmd.py
index 6066b6545412d697711d7b0f13763eb0c4962afc..6ebebec9fc405874c5f9d5440b438bf665df0f77 100755 (executable)
--- a/cmd/restore-cmd.py
+++ b/cmd/restore-cmd.py
@@ -64,7 +64,7 @@ def do_node(top, n):
         
 handle_ctrl_c()
 
-o = options.Options('bup restore', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 git.check_repo_or_die()

diff --git a/cmd/save-cmd.py b/cmd/save-cmd.py
index 4720af714ee52f1a095b918ff31c2e4bd97616bd..ffbe94be041432ab848c864f1d3da709cb1e2068 100755 (executable)
--- a/cmd/save-cmd.py
+++ b/cmd/save-cmd.py
@@ -21,7 +21,7 @@ strip      strips the path to every filename given
 strip-path= path-prefix to be stripped when saving
 graft=     a graft point *old_path*=*new_path* (can be used morethan once)
 """
-o = options.Options('bup save', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 git.check_repo_or_die()

diff --git a/cmd/server-cmd.py b/cmd/server-cmd.py
index 695414dbad96c4b2685fd09ed766da89ee380e93..3bc998bcfe7927e70332bc0c2f3a1c8774a1eb2d 100755 (executable)
--- a/cmd/server-cmd.py
+++ b/cmd/server-cmd.py
@@ -156,7 +156,7 @@ def cat(conn, id):
 optspec = """
 bup server
 """
-o = options.Options('bup server', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if extra:

diff --git a/cmd/split-cmd.py b/cmd/split-cmd.py
index 7ecc5d018cc865a76727580c2c612eb04a2c060e..1673b2b1dcee765c976649e4a4933be58b4894da 100755 (executable)
--- a/cmd/split-cmd.py
+++ b/cmd/split-cmd.py
@@ -25,7 +25,7 @@ max-pack-objects=  maximum number of objects in a single pack
 fanout=    maximum number of blobs in a single tree
 bwlimit=   maximum bytes/sec to transmit to server
 """
-o = options.Options('bup split', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 handle_ctrl_c()

diff --git a/cmd/tag-cmd.py b/cmd/tag-cmd.py
index a624e8b8ace127d1ea434cad72723468448a61c9..bedd97c3504e5d9561cfa08e3f8ca8a7bb027ea8 100755 (executable)
--- a/cmd/tag-cmd.py
+++ b/cmd/tag-cmd.py
@@ -20,7 +20,7 @@ bup tag -d <tag name>
 d,delete=   Delete a tag
 """
 
-o = options.Options('bup tag', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 git.check_repo_or_die()

diff --git a/cmd/tick-cmd.py b/cmd/tick-cmd.py
index 8375dee2b82e7ffed26ea18e39d4eed227780de0..4d462ad7fe501188a1843f12062acf037b3a392a 100755 (executable)
--- a/cmd/tick-cmd.py
+++ b/cmd/tick-cmd.py
@@ -5,7 +5,7 @@ from bup import options
 optspec = """
 bup tick
 """
-o = options.Options('bup tick', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if extra:

diff --git a/cmd/version-cmd.py b/cmd/version-cmd.py
index 7ee65f97eeaca6bcf6a90bc82517e5bd39267c4b..1a68a6cbf787a432bb43202c62da58ded875d10c 100755 (executable)
--- a/cmd/version-cmd.py
+++ b/cmd/version-cmd.py
@@ -10,7 +10,7 @@ date    display the date this version of bup was created
 commit  display the git commit id of this version of bup
 tag     display the tag name of this version.  If no tag is available, display the commit id
 """
-o = options.Options('bup version', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 

diff --git a/cmd/web-cmd.py b/cmd/web-cmd.py
index 959b4f96d77a40634cbd6200029741866bf929e4..6e368a28c6886d48b00811e7b5ccafb431a6b193 100755 (executable)
--- a/cmd/web-cmd.py
+++ b/cmd/web-cmd.py
@@ -179,7 +179,7 @@ optspec = """
 bup web [[hostname]:port]
 --
 """
-o = options.Options('bup web', optspec)
+o = options.Options(optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
 
 if len(extra) > 1:

diff --git a/lib/bup/options.py b/lib/bup/options.py
index 5ff2a850a546007e9ff72e698518b8471a9946ee..17d1eef88183ace39182d25bd48745c6ff87a871 100644 (file)
--- a/lib/bup/options.py
+++ b/lib/bup/options.py
@@ -76,9 +76,8 @@ class Options:
     By default, the parser function is getopt.gnu_getopt, and the abort
     behaviour is to exit the program.
     """
-    def __init__(self, exe, optspec, optfunc=getopt.gnu_getopt,
+    def __init__(self, optspec, optfunc=getopt.gnu_getopt,
                  onabort=_default_onabort):
-        self.exe = exe
         self.optspec = optspec
         self._onabort = onabort
         self.optfunc = optfunc

diff --git a/lib/bup/t/toptions.py b/lib/bup/t/toptions.py
index 02d9839621d8d91261bd3ff9d9aee70c29c67e4b..d01ba512e15ac828045d8272d0592539158b53bd 100644 (file)
--- a/lib/bup/t/toptions.py
+++ b/lib/bup/t/toptions.py
@@ -42,7 +42,7 @@ no-stupid  disable stupidity
 
 @wvtest
 def test_options():
-    o = options.Options('exename', optspec)
+    o = options.Options(optspec)
     (opt,flags,extra) = o.parse(['-tttqp', 7, '--longoption', '19',
                                  'hanky', '--onlylong'])
     WVPASSEQ(flags[0], ('-t', ''))