diff options
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/cfg.py | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py index 2430077..3c545be 100644 --- a/openstack/common/cfg.py +++ b/openstack/common/cfg.py @@ -948,24 +948,6 @@ class MultiConfigParser(object): raise KeyError -class ConfigCliParser(argparse.ArgumentParser): - - def __init__(self, prog=None, usage=None, version=None, *args, **kwargs): - super(ConfigCliParser, self).__init__(prog=prog, usage=usage, - *args, **kwargs) - - self.add_argument('--version', action='version', version=version) - - def add_argument(self, *args, **kwargs): - try: - super(ConfigCliParser, self).add_argument(*args, **kwargs) - except(argparse.ArgumentError) as e: - raise DuplicateOptError(e) - - def add_subparsers(self, **kwargs): - return super(ConfigCliParser, self).add_subparsers(**kwargs) - - class ConfigOpts(collections.Mapping): """ @@ -1003,9 +985,7 @@ class ConfigOpts(collections.Mapping): # if _pre_init_parser does not exist, create one if self._pre_init_parser is None: - self._oparser = ConfigCliParser(prog=prog, - version=version, - usage=usage) + self._oparser = argparse.ArgumentParser(prog=prog, usage=usage) # otherwise, use the pre-initialized parser with subparsers # and re-initialize parser else: @@ -1015,6 +995,10 @@ class ConfigOpts(collections.Mapping): self._oparser.usage = usage self._pre_init_parser = None + self._oparser.add_argument('--version', + action='version', + version=version) + return prog, default_config_files def _setup(self, project, prog, version, usage, default_config_files): @@ -1135,7 +1119,7 @@ class ConfigOpts(collections.Mapping): # only add subparsers to pre-initialized root parser # to avoid cleared by self.clear() if self._pre_init_parser is None: - self._pre_init_parser = ConfigCliParser() + self._pre_init_parser = argparse.ArgumentParser() return self._pre_init_parser.add_subparsers(**kwargs) def reset(self): |