Merge "Update cfg from openstack-common"

1 files changed, 6 insertions, 2 deletions

diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py
index 18ae002df..586aa7744 100644
--- a/nova/openstack/common/cfg.py
+++ b/nova/openstack/common/cfg.py
@@ -691,7 +691,7 @@ class OptGroup(object):
         return self._optparse_group
 
 
-class ConfigOpts(collections.Mapping, object):
+class ConfigOpts(collections.Mapping):
 
     """
     Config options which may be set on the command line or in config files.
@@ -964,6 +964,10 @@ class ConfigOpts(collections.Mapping, object):
         """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.
 
@@ -1076,7 +1080,7 @@ class ConfigOpts(collections.Mapping, object):
             not_read_ok = filter(lambda f: f not in read_ok, config_files)
             raise ConfigFilesNotFoundError(not_read_ok)
 
-    class GroupAttr(collections.Mapping, object):
+    class GroupAttr(collections.Mapping):
 
         """
         A helper class representing the option values of a group as a mapping