summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorZhongyue Luo <lzyeval@gmail.com>2012-02-12 16:04:21 +0800
committerZhongyue Luo <lzyeval@gmail.com>2012-02-12 16:05:54 +0800
commit8f1de0c493a68eec5801037590d769e711f19127 (patch)
tree773f6b2337b6309d27f0cc8623e7648010b3e81a /openstack
parent684ea9f2eef2926d3e5856eea124a47e475ff3ae (diff)
downloadoslo-8f1de0c493a68eec5801037590d769e711f19127.tar.gz
oslo-8f1de0c493a68eec5801037590d769e711f19127.tar.xz
oslo-8f1de0c493a68eec5801037590d769e711f19127.zip
cfg: unneeded multiple inheritance
Fixed bug #927650 In python=<2.6, collections.Mapping inherits from collections.Sized, collections.Iterable, and collections.Container which are also subclasses of object. Change-Id: I6238c683324127abd9fb637748a10b6bdb2961e0
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/cfg.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py
index a9ac004..fceb9ed 100644
--- a/openstack/common/cfg.py
+++ b/openstack/common/cfg.py
@@ -688,7 +688,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.
@@ -1073,7 +1073,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