Browse Source

Support "nilmtool cmd --version"

tags/nilmdb-1.9.0
Jim Paris 10 years ago
parent
commit
8e8ec59e30
2 changed files with 14 additions and 0 deletions
  1. +8
    -0
      nilmdb/cmdline/cmdline.py
  2. +6
    -0
      tests/test_cmdline.py

+ 8
- 0
nilmdb/cmdline/cmdline.py View File

@@ -29,6 +29,14 @@ for cmd in subcommands:
subcmd_mods[cmd] = __import__("nilmdb.cmdline." + cmd, fromlist = [ cmd ])

class JimArgumentParser(argparse.ArgumentParser):
def parse_args(self, args=None, namespace=None):
# Look for --version anywhere and change it to just "nilmtool
# --version". This makes "nilmtool cmd --version" work, which
# is needed by help2man.
if "--version" in (args or sys.argv[1:]):
args = [ "--version" ]
return argparse.ArgumentParser.parse_args(self, args, namespace)

def error(self, message):
self.print_usage(sys.stderr)
self.exit(2, sprintf("error: %s\n", message))


+ 6
- 0
tests/test_cmdline.py View File

@@ -160,6 +160,12 @@ class TestCmdline(object):
self.ok("--help")
self.contain("usage:")

# help
self.ok("--version")
ver = self.captured
self.ok("list --version")
eq_(self.captured, ver)

# fail for no args
self.fail("")



Loading…
Cancel
Save