From d42b0297044b61fc1355abc2be6db59788bb2534 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 23 Aug 2016 17:39:49 +0100 Subject: [PATCH] conf: Make list->dict conversion more specific All of the Nova configuration options' 'list_opts' functions have been updated to return dicts rather than lists of tuples. However, two dependency libraries still return dicts. Replace the general handling code for this with specific code in the two offending places. This gives a more actionable resolution. Blueprint centralize-config-options-ocata Change-Id: I5ce9ac2037e4374215a96e09e12b0873c31dd27e --- nova/conf/opts.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/nova/conf/opts.py b/nova/conf/opts.py index 1bb5dcc0d..9aed6b28c 100644 --- a/nova/conf/opts.py +++ b/nova/conf/opts.py @@ -72,19 +72,8 @@ def _import_modules(module_names): return imported_modules -def _process_old_opts(configs): - """Convert old-style 2-tuple configs to dicts.""" - if isinstance(configs, tuple): - configs = [configs] - return {label: options for label, options in configs} - - def _append_config_options(imported_modules, config_options): for mod in imported_modules: configs = mod.list_opts() - # TODO(markus_z): Remove this compatibility shim once all list_opts() - # functions have been updated to return dicts. - if not isinstance(configs, dict): - configs = _process_old_opts(configs) for key, val in configs.items(): config_options[key].extend(val)