From: Gabriel Filion <lelutin@gmail.com>
Date: Mon, 17 Jan 2011 01:38:56 +0000 (-0500)
Subject: options: remove unused 'exe' parameter
X-Git-Tag: bup-0.22~14
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=581e9dff93565d57d777ac3a2b93c09844c7263b

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 6f630fd..49dbed0 100755
--- 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 41503ee..5be71b5 100755
--- 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 1c25058..44decd8 100755
--- 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 1edb5f5..d63a710 100755
--- 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 450d366..9253a18 100755
--- 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 b22a68f..c507a37 100755
--- 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 43314d9..0ff637a 100755
--- 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 80037e9..2e4a151 100755
--- 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 81febac..edc5fcb 100755
--- 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 bbc0432..44359a3 100755
--- 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 90dbdcd..9b7fd60 100755
--- 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 fb202b7..19c3393 100755
--- 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 1ef09e0..8b2ea2b 100755
--- 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 6b505b4..2c86d5d 100755
--- 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 3d2af56..327c81f 100755
--- 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 c40a6e8..e9a4a23 100755
--- 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 873b511..4be3660 100755
--- 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 6066b65..6ebebec 100755
--- 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 4720af7..ffbe94b 100755
--- 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 695414d..3bc998b 100755
--- 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 7ecc5d0..1673b2b 100755
--- 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 a624e8b..bedd97c 100755
--- 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 8375dee..4d462ad 100755
--- 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 7ee65f9..1a68a6c 100755
--- 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 959b4f9..6e368a2 100755
--- 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 5ff2a85..17d1eef 100644
--- 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 02d9839..d01ba51 100644
--- 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', ''))