summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-02-22 21:04:11 +0000
committerMark McLoughlin <markmc@redhat.com>2012-02-23 06:20:40 +0000
commit1f119bc91f178df43f1cec6df3247f6f6a4e0c36 (patch)
treec407593df7e1cea35e789f182f1daec98af3d0e0
parent762b461720fced80435de818f9f843ced5059035 (diff)
Use cfg's new print_help() method
Change-Id: Ib8e5dc50bc9773d13b8d9c741676477aa0f001e0
-rw-r--r--keystone/config.py3
-rw-r--r--keystone/openstack/common/cfg.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/keystone/config.py b/keystone/config.py
index ab2f429c..18962b29 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -32,9 +32,6 @@ class ConfigMixin(object):
kw.setdefault('args', [])
return super(ConfigMixin, self).__call__(*args, **kw)
- def print_help(self):
- self._oparser.print_help()
-
def set_usage(self, usage):
self.usage = usage
self._oparser.usage = usage
diff --git a/keystone/openstack/common/cfg.py b/keystone/openstack/common/cfg.py
index 92eecf30..e92a574a 100644
--- a/keystone/openstack/common/cfg.py
+++ b/keystone/openstack/common/cfg.py
@@ -962,6 +962,10 @@ class ConfigOpts(collections.Mapping):
"""Print the usage message for the current program."""
self._oparser.print_usage(file)
+ def print_help(self, file=None):
+ """Print the help message for the current program."""
+ self._oparser.print_help(file)
+
def _get(self, name, group=None):
"""Look up an option value.