diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-07 02:33:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-07 02:33:59 +0000 |
| commit | ac2779d7bac86aade600b0e361755e2ef671cb98 (patch) | |
| tree | fb01fb41890414609fd1c847614147f70c5b0751 | |
| parent | 28ef50e9311166b23fabdef0cbfdba49f257ac2d (diff) | |
| parent | a72e49c3ec7ec28c88d501b50d94bf46e08d515e (diff) | |
| download | oslo-config-ac2779d7bac86aade600b0e361755e2ef671cb98.tar.gz | |
Merge "generator: refactor MultiStrOpt handling"
| -rw-r--r-- | oslo/config/generator.py | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/oslo/config/generator.py b/oslo/config/generator.py index 9962030..46d21c1 100644 --- a/oslo/config/generator.py +++ b/oslo/config/generator.py @@ -207,30 +207,31 @@ class _OptFormatter(object): lines.append('# Deprecated group/name - [%s]/%s\n' % (d.group or 'DEFAULT', d.name or opt.dest)) - if opt.default is None: - default_str = '<None>' - elif isinstance(opt, cfg.StrOpt): - default_str = opt.default - elif isinstance(opt, cfg.BoolOpt): - default_str = str(opt.default).lower() - elif (isinstance(opt, cfg.IntOpt) or - isinstance(opt, cfg.FloatOpt)): - default_str = str(opt.default) - elif isinstance(opt, cfg.ListOpt): - default_str = ','.join(opt.default) - elif isinstance(opt, cfg.DictOpt): - sorted_items = sorted(opt.default.items(), - key=operator.itemgetter(0)) - default_str = ','.join(['%s:%s' % i for i in sorted_items]) - elif isinstance(opt, cfg.MultiStrOpt): - default_str = str(opt.default) + if isinstance(opt, cfg.MultiStrOpt): + if opt.default is None: + defaults = ['<None>'] + else: + defaults = opt.default else: - LOG.warning('Unknown option type: %s', repr(opt)) - default_str = str(opt.default) - - defaults = [default_str] - if isinstance(opt, cfg.MultiStrOpt) and opt.default: - defaults = opt.default + if opt.default is None: + default_str = '<None>' + elif isinstance(opt, cfg.StrOpt): + default_str = opt.default + elif isinstance(opt, cfg.BoolOpt): + default_str = str(opt.default).lower() + elif (isinstance(opt, cfg.IntOpt) or + isinstance(opt, cfg.FloatOpt)): + default_str = str(opt.default) + elif isinstance(opt, cfg.ListOpt): + default_str = ','.join(opt.default) + elif isinstance(opt, cfg.DictOpt): + sorted_items = sorted(opt.default.items(), + key=operator.itemgetter(0)) + default_str = ','.join(['%s:%s' % i for i in sorted_items]) + else: + LOG.warning('Unknown option type: %s', repr(opt)) + default_str = str(opt.default) + defaults = [default_str] for default_str in defaults: default_str = self.sanitize_default(opt, default_str) |