diff options
Diffstat (limited to 'dnsviz/commands')
| -rw-r--r-- | dnsviz/commands/graph.py | 7 | ||||
| -rw-r--r-- | dnsviz/commands/grok.py | 7 | ||||
| -rw-r--r-- | dnsviz/commands/print.py | 7 | ||||
| -rw-r--r-- | dnsviz/commands/probe.py | 7 |
4 files changed, 20 insertions, 8 deletions
diff --git a/dnsviz/commands/graph.py b/dnsviz/commands/graph.py index ab68810..2539e35 100644 --- a/dnsviz/commands/graph.py +++ b/dnsviz/commands/graph.py @@ -143,7 +143,7 @@ class GraphArgHelper: self._logger = logger - def build_parser(self, prog, args): + def build_parser(self, prog): self.parser = argparse.ArgumentParser(description='Graph the assessment of diagnostic DNS queries', prog=prog) # python3/python2 dual compatibility @@ -232,6 +232,8 @@ class GraphArgHelper: help='Domain names') self._arg_mapping = dict([(a.dest, '/'.join(a.option_strings)) for a in self.parser._actions]) + + def parse_args(self, args): self.args = self.parser.parse_args(args) @classmethod @@ -411,7 +413,8 @@ def main(argv): test_pygraphviz() arghelper = GraphArgHelper(logger) - arghelper.build_parser('%s %s' % (sys.argv[0], argv[0]), argv[1:]) + arghelper.build_parser('%s %s' % (sys.argv[0], argv[0])) + arghelper.parse_args(argv[1:]) logger.setLevel(logging.WARNING) try: diff --git a/dnsviz/commands/grok.py b/dnsviz/commands/grok.py index f4d8059..398dbc1 100644 --- a/dnsviz/commands/grok.py +++ b/dnsviz/commands/grok.py @@ -166,7 +166,7 @@ class GrokArgHelper: self._logger = logger - def build_parser(self, prog, args): + def build_parser(self, prog): self.parser = argparse.ArgumentParser(description='Assess diagnostic DNS queries', prog=prog) # python3/python2 dual compatibility @@ -247,6 +247,8 @@ class GrokArgHelper: help='Domain names') self._arg_mapping = dict([(a.dest, '/'.join(a.option_strings)) for a in self.parser._actions]) + + def parse_args(self, args): self.args = self.parser.parse_args(args) @classmethod @@ -403,7 +405,8 @@ def main(argv): try: arghelper = GrokArgHelper(logger) - arghelper.build_parser('%s %s' % (sys.argv[0], argv[0]), argv[1:]) + arghelper.build_parser('%s %s' % (sys.argv[0], argv[0])) + arghelper.parse_args(argv[1:]) logger.setLevel(logging.WARNING) try: diff --git a/dnsviz/commands/print.py b/dnsviz/commands/print.py index 40ea8d7..6eb83b2 100644 --- a/dnsviz/commands/print.py +++ b/dnsviz/commands/print.py @@ -301,7 +301,7 @@ class PrintArgHelper: self._logger = logger - def build_parser(self, prog, args): + def build_parser(self, prog): self.parser = argparse.ArgumentParser(description='Print the assessment of diagnostic DNS queries', prog=prog) # python3/python2 dual compatibility @@ -382,6 +382,8 @@ class PrintArgHelper: help='Domain names') self._arg_mapping = dict([(a.dest, '/'.join(a.option_strings)) for a in self.parser._actions]) + + def parse_args(self, args): self.args = self.parser.parse_args(args) @classmethod @@ -545,7 +547,8 @@ def main(argv): test_pygraphviz() arghelper = PrintArgHelper(logger) - arghelper.build_parser('%s %s' % (sys.argv[0], argv[0]), argv[1:]) + arghelper.build_parser('%s %s' % (sys.argv[0], argv[0])) + arghelper.parse_args(argv[1:]) logger.setLevel(logging.WARNING) try: diff --git a/dnsviz/commands/probe.py b/dnsviz/commands/probe.py index f337870..bb01c0a 100644 --- a/dnsviz/commands/probe.py +++ b/dnsviz/commands/probe.py @@ -910,7 +910,7 @@ class ArgHelper: self._logger = logger self._zones_to_serve = [] - def build_parser(self, prog, args): + def build_parser(self, prog): self.parser = argparse.ArgumentParser(description='Issue diagnostic DNS queries', prog=prog) helper = DomainListArgHelper(self._resolver) @@ -1027,6 +1027,8 @@ class ArgHelper: help='Domain names') self._arg_mapping = dict([(a.dest, '/'.join(a.option_strings)) for a in self.parser._actions]) + + def parse_args(self, args): self.args = self.parser.parse_args(args) @classmethod @@ -1459,7 +1461,8 @@ def main(argv): sys.exit(1) arghelper = ArgHelper(bootstrap_resolver, logger) - arghelper.build_parser('%s %s' % (sys.argv[0], argv[0]), argv[1:]) + arghelper.build_parser('%s %s' % (sys.argv[0], argv[0])) + arghelper.parse_args(argv[1:]) logger.setLevel(arghelper.get_log_level()) try: |