X-Git-Url: https://git.kaliko.me/?p=mpd-goodies.git;a=blobdiff_plain;f=lib%2Fstartop.py;h=945e5bb59cb77385cd5422516a34f53c24552600;hp=0ede89a20d0b2900564626796903ba459973763d;hb=48b7d6d36d562284ee3da4538d5b5990306bb45d;hpb=1cb3b44761a6b51dd8ac5a0c8279e46e41b91847 diff --git a/lib/startop.py b/lib/startop.py index 0ede89a..945e5bb 100644 --- a/lib/startop.py +++ b/lib/startop.py @@ -51,12 +51,14 @@ class StartOpt(object): """ """ - def __init__(self, script_info, options):#{{{ + def __init__(self, script_info, child_options):#{{{ self.parser = None self.cli_options = dict({}) self.cli_args = dict({}) self.info = dict(script_info) - self.options = list(options + OPTS) + # options allows to add new cli options within child objects calling + # parent __init__() + self.options = list(child_options + OPTS) self.main()#}}} def declare_opts(self):#{{{ @@ -66,8 +68,12 @@ class StartOpt(object): version = self.info.get('version') prog = self.info.get('prog_name') des = self.info.get('description') + if 'usage' in self.info: + usage = self.info.get('usage') + else: + usage = USAGE self.parser = OptionParser(version=version, - usage=USAGE, + usage=usage, prog=prog, description=des) con_id, passwd = get_mpd_environ()